Changeset 596 for trunk/server/source3/passdb/pdb_ldap.c

Timestamp:

Jul 2, 2011, 3:35:33 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.8

File:

• trunk/server/source3/passdb/pdb_ldap.c (modified) (2 diffs)

trunk/server/source3/passdb/pdb_ldap.c

@@ -4485 +4485 @@
 
  retry:
-        if (state->current_entry == NULL) {
-                return false;
-        }
-
         if ((state->entries == NULL) && (state->pagedresults_cookie == NULL))
                 return False;
@@ -4495 +4491 @@
             !ldapsam_search_nextpage(search))
                     return False;
+
+        if (state->current_entry == NULL) {
+                return false;
+        }
 
         result = state->ldap2displayentry(state, search,