From a56c6883661123ed7eb07f7e6f0e947714d1d575 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Tue, 6 Jul 2010 16:55:14 +0200 Subject: s3: Fix another aspect of bug 7262 and make paged results work again --- source3/passdb/pdb_ldap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source3/passdb/pdb_ldap.c') diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c index 6ac8f0df24..f4c8dbe516 100644 --- 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); -- cgit