svn commit: samba r17016 - branches/SAMBA_3_0/source/auth trunk/source/auth

[vlendec at samba.org]

Author: vlendec
Date: 2006-07-13 16:28:38 +0000 (Thu, 13 Jul 2006)
New Revision: 17016

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

Log:
Different and smaller fix for the valid users = username problem.

If no winbind is around, the best we can do to get the user's token correct is
to ask unix via create_token_from_username. More investigation is needed if
this also fixes the +groupname for unmapped groups problems more cleanly.

Volker
Modified:
   branches/SAMBA_3_0/source/auth/auth_util.c
   trunk/source/auth/auth_util.c


Changeset:
Modified: branches/SAMBA_3_0/source/auth/auth_util.c
===================================================================
--- branches/SAMBA_3_0/source/auth/auth_util.c	2006-07-13 16:16:29 UTC (rev 17015)
+++ branches/SAMBA_3_0/source/auth/auth_util.c	2006-07-13 16:28:38 UTC (rev 17016)
@@ -950,7 +950,13 @@
 		return NT_STATUS_NO_MEMORY;
 	}
 
-	if (server_info->was_mapped) {
+	/*
+	 * If winbind is not around, we can not make much use of the SIDs the
+	 * domain controller provided us with. Likewise if the user name was
+	 * mapped to some local unix user.
+	 */
+
+	if ((!winbind_ping()) || (server_info->was_mapped)) {
 		status = create_token_from_username(server_info,
 						    server_info->unix_name,
 						    server_info->guest,

Modified: trunk/source/auth/auth_util.c
===================================================================
--- trunk/source/auth/auth_util.c	2006-07-13 16:16:29 UTC (rev 17015)
+++ trunk/source/auth/auth_util.c	2006-07-13 16:28:38 UTC (rev 17016)
@@ -950,7 +950,13 @@
 		return NT_STATUS_NO_MEMORY;
 	}
 
-	if (server_info->was_mapped) {
+	/*
+	 * If winbind is not around, we can not make much use of the SIDs the
+	 * domain controller provided us with. Likewise if the user name was
+	 * mapped to some local unix user.
+	 */
+
+	if ((!winbind_ping()) || (server_info->was_mapped)) {
 		status = create_token_from_username(server_info,
 						    server_info->unix_name,
 						    server_info->guest,