diff options
author | Volker Lendecke <vl@samba.org> | 2010-06-10 15:40:14 +0200 |
---|---|---|
committer | Karolin Seeger <kseeger@samba.org> | 2011-01-13 17:58:49 +0100 |
commit | 1fc9f1489507058ae351ba68d7963db0dd0e6cd3 (patch) | |
tree | 83dd72fc73e2ac96b405a2313add86f2579305cc | |
parent | 3633fad4422a1e9f5852bd552a2fb62a444fbd21 (diff) | |
download | samba-1fc9f1489507058ae351ba68d7963db0dd0e6cd3.tar.gz samba-1fc9f1489507058ae351ba68d7963db0dd0e6cd3.tar.xz samba-1fc9f1489507058ae351ba68d7963db0dd0e6cd3.zip |
s3: Fix EnumDomainAliases when no aliases are in LDAP
We used to return NT_STATUS_ACCESS_DENIED, now we just return 0 entries, just
like W2k8 does.
usrmgr.exe was pretty unhappy with the NT_STATUS_ACCESS_DENIED
(cherry picked from commit f66cc827096c53d4d16b8c850c83a3b5664e9725)
Fix bug #7262 (Unable to maintain users' groups via UsrMgr).
(cherry picked from commit 1439a1d7ff406dd5dce885100349751151c14bf6)
(cherry picked from commit bd6a48e687636d5d9489129faff00e45d50d0d31)
-rw-r--r-- | source3/passdb/pdb_ldap.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c index 249a990d257..559b87cfde1 100644 --- a/source3/passdb/pdb_ldap.c +++ b/source3/passdb/pdb_ldap.c @@ -4416,12 +4416,6 @@ static bool ldapsam_search_firstpage(struct pdb_search *search) } state->current_entry = ldap_first_entry(ld, state->entries); - if (state->current_entry == NULL) { - ldap_msgfree(state->entries); - state->entries = NULL; - return false; - } - return True; } @@ -4464,6 +4458,10 @@ 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; |