summaryrefslogtreecommitdiff
path: root/source3/passdb
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-07-06 16:55:14 +0200
committerBjörn Jacke <bj@sernet.de>2010-07-06 17:36:18 +0200
commita56c6883661123ed7eb07f7e6f0e947714d1d575 (patch)
tree15161896b87583dcfe2af9dd66236c878366b09d /source3/passdb
parent4efa1081aadc4de22bc1e8c51c41978464730f95 (diff)
downloadsamba-a56c6883661123ed7eb07f7e6f0e947714d1d575.tar.gz
samba-a56c6883661123ed7eb07f7e6f0e947714d1d575.tar.bz2
samba-a56c6883661123ed7eb07f7e6f0e947714d1d575.zip
s3: Fix another aspect of bug 7262 and make paged results work again
Diffstat (limited to 'source3/passdb')
-rw-r--r--source3/passdb/pdb_ldap.c8
1 files changed, 4 insertions, 4 deletions
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);