svn commit: samba r4851 - branches/SAMBA_3_0/source/passdb trunk/source/passdb

gd at samba.org gd at samba.org
Wed Jan 19 17:42:33 GMT 2005


Author: gd
Date: 2005-01-19 17:42:33 +0000 (Wed, 19 Jan 2005)
New Revision: 4851

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

Log:
Preleminary fix for ldapsam_enum_group_memberships when
ldapsam:trusted=True. Don't bail out when ldap-search returns pure
posixgroups (w.o. samba group-mapping).

This way those unix-memberships do not appear in user and nt user token.
Volker, could you please look over that one?

Guenther

Modified:
   branches/SAMBA_3_0/source/passdb/pdb_ldap.c
   trunk/source/passdb/pdb_ldap.c


Changeset:
Modified: branches/SAMBA_3_0/source/passdb/pdb_ldap.c
===================================================================
--- branches/SAMBA_3_0/source/passdb/pdb_ldap.c	2005-01-19 17:08:36 UTC (rev 4850)
+++ branches/SAMBA_3_0/source/passdb/pdb_ldap.c	2005-01-19 17:42:33 UTC (rev 4851)
@@ -2225,7 +2225,7 @@
 		if (!smbldap_get_single_attribute(conn->ldap_struct,
 						  entry, "sambaSID",
 						  str, sizeof(str)-1))
-			goto done;
+			continue;
 
 		if (!string_to_sid(&sid, str))
 			goto done;
@@ -2233,7 +2233,7 @@
 		if (!smbldap_get_single_attribute(conn->ldap_struct,
 						  entry, "gidNumber",
 						  str, sizeof(str)-1))
-			goto done;
+			continue;
 
 		gid = strtoul(str, &end, 10);
 
@@ -2249,7 +2249,7 @@
 	}
 
 	if (sid_compare(&global_sid_NULL, &(*sids)[0]) == 0) {
-		DEBUG(3, ("primary group not found\n"));
+		DEBUG(3, ("primary group of [%s] not found\n", username));
 		goto done;
 	}
 

Modified: trunk/source/passdb/pdb_ldap.c
===================================================================
--- trunk/source/passdb/pdb_ldap.c	2005-01-19 17:08:36 UTC (rev 4850)
+++ trunk/source/passdb/pdb_ldap.c	2005-01-19 17:42:33 UTC (rev 4851)
@@ -2278,7 +2278,7 @@
 		if (!smbldap_get_single_attribute(conn->ldap_struct,
 						  entry, "sambaSID",
 						  str, sizeof(str)-1))
-			goto done;
+			continue;
 
 		if (!string_to_sid(&sid, str))
 			goto done;
@@ -2286,7 +2286,7 @@
 		if (!smbldap_get_single_attribute(conn->ldap_struct,
 						  entry, "gidNumber",
 						  str, sizeof(str)-1))
-			goto done;
+			continue;
 
 		gid = strtoul(str, &end, 10);
 
@@ -2302,7 +2302,7 @@
 	}
 
 	if (sid_compare(&global_sid_NULL, &(*sids)[0]) == 0) {
-		DEBUG(3, ("primary group not found\n"));
+		DEBUG(3, ("primary group of [%s] not found\n", username));
 		goto done;
 	}
 



More information about the samba-cvs mailing list