summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2006-08-29 15:42:09 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:38:58 -0500
commit545353b062a82920fa8040f248d55c04da33f735 (patch)
tree132cdd67d5332d13fbb59f2690e319eb9e8c544d /source3
parentb9b8967ff9f86f0d7485cdac9c457dd47b19d1b1 (diff)
downloadsamba-545353b062a82920fa8040f248d55c04da33f735.tar.gz
samba-545353b062a82920fa8040f248d55c04da33f735.tar.bz2
samba-545353b062a82920fa8040f248d55c04da33f735.zip
r17909: ensure we do not call map_username() twice on Krb5 session setups
(This used to be commit 779eba0a7cab3156b8580410cfe288609a288548)
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/sesssetup.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index fb579707ca..dd8d9fc852 100644
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -320,10 +320,14 @@ static int reply_spnego_kerberos(connection_struct *conn,
sub_set_smb_name( real_username );
reload_services(True);
+
if ( map_domainuser_to_guest ) {
make_server_info_guest(&server_info);
} else if (logon_info) {
- ret = make_server_info_info3(mem_ctx, real_username, domain,
+ /* pass the unmapped username here since map_username()
+ will be called again from inside make_server_info_info3() */
+
+ ret = make_server_info_info3(mem_ctx, user, domain,
&server_info, &logon_info->info3);
if ( !NT_STATUS_IS_OK(ret) ) {
DEBUG(1,("make_server_info_info3 failed: %s!\n",