r23404: Fix wrong (and missing) action on error condition in ldap reply evaluation...
authorSimo Sorce <idra@samba.org>
Sat, 9 Jun 2007 18:18:24 +0000 (18:18 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 17:23:13 +0000 (12:23 -0500)
Fixes one of the segfaults in bug #4667
(This used to be commit 176e1c0b692b9509a29bbbb2b35ad821dfb0d5aa)

source3/nsswitch/idmap_ldap.c

index 7fdf16beaaefe9aec7185fe5572222770c2cf59d..e5dd658fe386c77299f0a399d31b13a204ff5b0c 100644 (file)
@@ -965,7 +965,7 @@ again:
                }
                if ( ! entry) {
                        DEBUG(2, ("ERROR: Unable to fetch ldap entries from results\n"));
-                       continue;
+                       break;
                }
 
                /* first check if the SID is present */
@@ -1180,6 +1180,10 @@ again:
                } else { /* following ones */
                        entry = ldap_next_entry(ctx->smbldap_state->ldap_struct, entry);
                }
+               if ( ! entry) {
+                       DEBUG(2, ("ERROR: Unable to fetch ldap entries from results\n"));
+                       break;
+               }
 
                /* first check if the SID is present */
                sidstr = smbldap_talloc_single_attribute(