svn commit: samba r13464 - in trunk/source/lib: .

[vlendec at samba.org]

Author: vlendec
Date: 2006-02-11 23:28:16 +0000 (Sat, 11 Feb 2006)
New Revision: 13464

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

Log:
getgroups_unix_user is only ever called for unix users. So there's no point in
ever asking winbind from this routine.

Volker
Modified:
   trunk/source/lib/system_smbd.c


Changeset:
Modified: trunk/source/lib/system_smbd.c
===================================================================
--- trunk/source/lib/system_smbd.c	2006-02-11 23:26:56 UTC (rev 13463)
+++ trunk/source/lib/system_smbd.c	2006-02-11 23:28:16 UTC (rev 13464)
@@ -123,14 +123,16 @@
 
 	DEBUG(10,("sys_getgrouplist: user [%s]\n", user));
 	
-	/* see if we should disable winbindd lookups for local users */
-	if (strchr(user, *lp_winbind_separator()) == NULL) {
-		if ( !winbind_off() )
-			DEBUG(0,("sys_getgroup_list: Insufficient environment space "
-				 "for %s\n", WINBINDD_DONT_ENV));
-		else
-			DEBUG(10,("sys_getgrouplist(): disabled winbindd for group "
-				  "lookup [user == %s]\n", user));
+	/* This is only ever called for Unix users, remote memberships are
+	 * always determined by the info3 coming back from auth3 or the
+	 * PAC. */
+
+	if ( !winbind_off() ) {
+		DEBUG(0,("sys_getgroup_list: Insufficient environment space "
+			 "for %s\n", WINBINDD_DONT_ENV));
+	} else {
+		DEBUG(10,("sys_getgrouplist(): disabled winbindd for group "
+			  "lookup [user == %s]\n", user));
 	}
 
 #ifdef HAVE_GETGROUPLIST