s3: Fix another aspect of bug 7262 and make paged results work again

diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index 6ac8f0df24a02b3064a080e695152191ab573eff..f4c8dbe5168a49c91593fbfac759b25504e948c6 100644 (file)
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -4483,10 +4483,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;
 
@@ -4494,6 +4490,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);