diff options
| author | Gerald Carter <jerry@samba.org> | 2006-08-29 15:42:09 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:38:58 -0500 |
| commit | 779eba0a7cab3156b8580410cfe288609a288548 (patch) | |
| tree | aea38f5a7443210603e2c630df515c563f675826 /source/smbd | |
| parent | b9227bde1328c09c61cc23fdbb4fa756e919c4a6 (diff) | |
| download | samba-779eba0a7cab3156b8580410cfe288609a288548.tar.gz samba-779eba0a7cab3156b8580410cfe288609a288548.tar.xz samba-779eba0a7cab3156b8580410cfe288609a288548.zip | |
r17909: ensure we do not call map_username() twice on Krb5 session setups
Diffstat (limited to 'source/smbd')
| -rw-r--r-- | source/smbd/sesssetup.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/smbd/sesssetup.c b/source/smbd/sesssetup.c index fb579707cae..dd8d9fc8525 100644 --- a/source/smbd/sesssetup.c +++ b/source/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", |