s3: Fix another aspect of bug 7262

(Unable to maintain users' groups via UsrMgr)
(cherry picked from commit 9b1d0d409824cff275aaf9563eaa3ed77ccf8466)

diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index db86a481544e83e2f008932d816f21b38560c46f..54b0f96802e32edced967ba6d7aa2d6f516b281c 100644 (file)
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -4484,10 +4484,6 @@ static bool ldapsam_search_next_entry(struct pdb_search *search,
        bool result;
 
  retry:
-       if (state->current_entry == NULL) {
-               return false;
-       }
-
        if ((state->entries == NULL) && (state->pagedresults_cookie == NULL))
                return False;
 
@@ -4495,6 +4491,10 @@ static bool ldapsam_search_next_entry(struct pdb_search *search,
            !ldapsam_search_nextpage(search))
                    return False;
 
+       if (state->current_entry == NULL) {
+               return false;
+       }
+
        result = state->ldap2displayentry(state, search,
                                          state->connection->ldap_struct,
                                          state->current_entry, entry);