[SCM] Samba Shared Repository - branch master updated
Björn Jacke
bjacke at samba.org
Tue Jul 6 09:37:41 MDT 2010
The branch, master has been updated
via a56c688... s3: Fix another aspect of bug 7262 and make paged results work again
from 4efa108... s4:rpc_server/lsa/dcesrv_lsa.c - fix typo
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit a56c6883661123ed7eb07f7e6f0e947714d1d575
Author: Volker Lendecke <vl at samba.org>
Date: Tue Jul 6 16:55:14 2010 +0200
s3: Fix another aspect of bug 7262 and make paged results work again
-----------------------------------------------------------------------
Summary of changes:
source3/passdb/pdb_ldap.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index 6ac8f0d..f4c8dbe 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);
--
Samba Shared Repository
More information about the samba-cvs
mailing list