s3-smbd: Replace client_id in smbd session setup.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index de766308da8a205dd7098938d91dddd9bc9dcb29..74d9e1cebf3e05f7d3a39079f8e9c12bd025018c 100644 (file)
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -347,7 +347,7 @@ static void reply_spnego_kerberos(struct smb_request *req,
        }
 
        ret = get_user_from_kerberos_info(talloc_tos(),
-                                         sconn->client_id.name,
+                                         sconn->remote_hostname,
                                          principal, logon_info,
                                          &username_was_mapped,
                                          &map_domainuser_to_guest,

diff --git a/source3/smbd/smb2_sesssetup.c b/source3/smbd/smb2_sesssetup.c
index 13dfff085398413111824a0ed348f5d705e0fc72..e09eff8849fe2d24fcd15d7f777ed385870412af 100644 (file)
--- a/source3/smbd/smb2_sesssetup.c
+++ b/source3/smbd/smb2_sesssetup.c
@@ -30,6 +30,7 @@
 #include "libads/kerberos_proto.h"
 #include "../lib/util/asn1.h"
 #include "auth.h"
+#include "../lib/tsocket/tsocket.h"
 
 static NTSTATUS smbd_smb2_session_setup(struct smbd_smb2_request *smb2req,
                                        uint64_t in_session_id,
@@ -215,7 +216,7 @@ static NTSTATUS smbd_smb2_session_setup_krb5(struct smbd_smb2_session *session,
        }
 
        status = get_user_from_kerberos_info(talloc_tos(),
-                                            smb2req->sconn->client_id.name,
+                                            session->sconn->remote_hostname,
                                             principal, logon_info,
                                             &username_was_mapped,
                                             &map_domainuser_to_guest,