summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2011-06-16 16:03:03 +0200
committerAndrew Bartlett <abartlet@samba.org>2011-07-04 18:28:30 +1000
commit2f92ffb1a41731ef7bfc7a3f38d54c1bffba2f34 (patch)
treecbdc78f60eef751836184817c9dc1fded3697bb6
parentea2917c7a2cab1605da6fcd9e0b4aa3476b1ff68 (diff)
downloadsamba-2f92ffb1a41731ef7bfc7a3f38d54c1bffba2f34.tar.gz
samba-2f92ffb1a41731ef7bfc7a3f38d54c1bffba2f34.tar.bz2
samba-2f92ffb1a41731ef7bfc7a3f38d54c1bffba2f34.zip
s3-smbd: Replace client_id in smbd session setup.
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
-rw-r--r--source3/smbd/sesssetup.c2
-rw-r--r--source3/smbd/smb2_sesssetup.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index de766308da..74d9e1cebf 100644
--- 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 13dfff0853..e09eff8849 100644
--- 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,