svn commit: samba r17909 - in branches: SAMBA_3_0/source/smbd SAMBA_3_0_23/source/smbd

[jerry at samba.org]

Author: jerry
Date: 2006-08-29 15:42:09 +0000 (Tue, 29 Aug 2006)
New Revision: 17909

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17909

Log:
ensure we do not call map_username() twice on Krb5 session setups
Modified:
   branches/SAMBA_3_0/source/smbd/sesssetup.c
   branches/SAMBA_3_0_23/source/smbd/sesssetup.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/sesssetup.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/sesssetup.c	2006-08-29 14:43:34 UTC (rev 17908)
+++ branches/SAMBA_3_0/source/smbd/sesssetup.c	2006-08-29 15:42:09 UTC (rev 17909)
@@ -320,10 +320,14 @@
 	
 	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",

Modified: branches/SAMBA_3_0_23/source/smbd/sesssetup.c
===================================================================
--- branches/SAMBA_3_0_23/source/smbd/sesssetup.c	2006-08-29 14:43:34 UTC (rev 17908)
+++ branches/SAMBA_3_0_23/source/smbd/sesssetup.c	2006-08-29 15:42:09 UTC (rev 17909)
@@ -320,10 +320,14 @@
 	
 	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",