Load samba-3.5.8 into branches/samba/upstream.upstream/3.5.8_dfsg

git-svn-id: svn://svn.debian.org/svn/pkg-samba/branches/samba/upstream@3691 fc4039ab-9d04-0410-8cac-899223bdd6b0

1 files changed, 4 insertions, 4 deletions

diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index db86a48154..54b0f96802 100644
--- 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);