[SCM] Samba Shared Repository - branch v3-5-test updated
Karolin Seeger
kseeger at samba.org
Fri Dec 31 12:07:06 MST 2010
The branch, v3-5-test has been updated
via 9b1d0d4 s3: Fix another aspect of bug 7262
from 83eb2e9 Ñ3/configue: set Tru64 cc's PIC switch right (none)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -----------------------------------------------------------------
commit 9b1d0d409824cff275aaf9563eaa3ed77ccf8466
Author: Volker Lendecke <vl at samba.org>
Date: Tue Jul 6 16:55:14 2010 +0200
s3: Fix another aspect of bug 7262
(Unable to maintain users' groups via UsrMgr)
-----------------------------------------------------------------------
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 db86a48..54b0f96 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);
--
Samba Shared Repository
More information about the samba-cvs
mailing list