git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
097ccfa
)
s3: Fix EnumDomainAliases when no aliases are in LDAP
author
Volker Lendecke
<vl@samba.org>
Thu, 10 Jun 2010 13:40:14 +0000
(15:40 +0200)
committer
Karolin Seeger
<kseeger@samba.org>
Fri, 18 Jun 2010 06:33:30 +0000
(08:33 +0200)
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
)
source3/passdb/pdb_ldap.c
patch
|
blob
|
history
diff --git
a/source3/passdb/pdb_ldap.c
b/source3/passdb/pdb_ldap.c
index aa60b7a6647898e1e15a0d1ecbfa932ac21f2233..db86a481544e83e2f008932d816f21b38560c46f 100644
(file)
--- 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;