r2374: Fix from Vince Brimhall vbrimhall@novell.com for

ldapsam_compat. Be robust against NULL attributes.
Jeremy.

diff --git a/source/passdb/pdb_ldap.c b/source/passdb/pdb_ldap.c
index 9af34705df50c05c74df316d907221db59808588..4f9140d3a854e0cee956fdda1cfb71acb41a3866 100644 (file)
--- a/source/passdb/pdb_ldap.c
+++ b/source/passdb/pdb_ldap.c
@@ -1229,8 +1229,13 @@ static void append_attr(char ***attr_list, const char *new_attr)
 {
        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);