svn commit: samba r2375 - in trunk/source/passdb: .

jra at samba.org jra at samba.org
Fri Sep 17 01:13:57 GMT 2004


Author: jra
Date: 2004-09-17 01:13:54 +0000 (Fri, 17 Sep 2004)
New Revision: 2375

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/trunk/source/passdb&rev=2375&nolog=1

Log:
Fix from Vince Brimhall vbrimhall at novell.com for 
ldapsam_compat. Be robust against NULL attributes.
Jeremy.

Modified:
   trunk/source/passdb/pdb_ldap.c


Changeset:
Modified: trunk/source/passdb/pdb_ldap.c
===================================================================
--- trunk/source/passdb/pdb_ldap.c	2004-09-17 01:13:47 UTC (rev 2374)
+++ trunk/source/passdb/pdb_ldap.c	2004-09-17 01:13:54 UTC (rev 2375)
@@ -1258,8 +1258,13 @@
 {
 	int i;
 
-	for (i=0; (*attr_list)[i] != NULL; i++)
+	if (new_attr == NULL) {
+		return;
+	}
+
+	for (i=0; (*attr_list)[i] != NULL; i++) {
 		;
+	}
 
 	(*attr_list) = Realloc((*attr_list), sizeof(**attr_list) * (i+2));
 	SMB_ASSERT((*attr_list) != NULL);



More information about the samba-cvs mailing list