summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-06-10 15:40:14 +0200
committerKarolin Seeger <kseeger@samba.org>2010-06-18 08:33:30 +0200
commit3e2a38d6ebdbfad1e7b6d6f86dfa85cd1f591e89 (patch)
tree8575ad78ad03cc3afab45a3cf685862aa1750188
parent097ccfaaf1b45b965ddde492b0fb7f9edf752775 (diff)
downloadsamba-3e2a38d6ebdbfad1e7b6d6f86dfa85cd1f591e89.tar.gz
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)
-rw-r--r--source3/passdb/pdb_ldap.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index aa60b7a6647..db86a481544 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -4442,12 +4442,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;
}
@@ -4490,6 +4484,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;