r18907: W00t. My original fix was correct after all :-).

Re-checking it in.
Fix bug #4095 - username composed into domain\user
twice in spnego path.
Jeremy.

diff --git a/source/smbd/sesssetup.c b/source/smbd/sesssetup.c
index dd8d9fc8525e5d74be3656cf4a5deecff2fffb04..8c8173ef3741df2c8f2439c29b77c120d09c1b6e 100644 (file)
--- a/source/smbd/sesssetup.c
+++ b/source/smbd/sesssetup.c
@@ -327,7 +327,7 @@ static int reply_spnego_kerberos(connection_struct *conn,
                /* 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, 
+               ret = make_server_info_info3(mem_ctx, client, domain, 
                                             &server_info, &logon_info->info3);
                if ( !NT_STATUS_IS_OK(ret) ) {
                        DEBUG(1,("make_server_info_info3 failed: %s!\n",