summaryrefslogtreecommitdiff
path: root/source3/nsswitch
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2006-05-05 15:44:00 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:16:49 -0500
commitc6fa16f330bbc0cc9f428622ca2c4ad0c75cf56a (patch)
tree32a67acc112954f06eefc20596c43972035cf4bd /source3/nsswitch
parent4137c63d0236d429c33b718674b365c6efcba695 (diff)
downloadsamba-c6fa16f330bbc0cc9f428622ca2c4ad0c75cf56a.tar.gz
samba-c6fa16f330bbc0cc9f428622ca2c4ad0c75cf56a.tar.bz2
samba-c6fa16f330bbc0cc9f428622ca2c4ad0c75cf56a.zip
r15460: Prefer to use the indexed objectCategory attribute (instead of
objectClass which is not indexed on AD) in LDAP queries. Guenther (This used to be commit 847882a98328b91a2157959c5dad0a2023223846)
Diffstat (limited to 'source3/nsswitch')
-rw-r--r--source3/nsswitch/winbindd_ads.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/nsswitch/winbindd_ads.c b/source3/nsswitch/winbindd_ads.c
index 30064603d1..d233821111 100644
--- a/source3/nsswitch/winbindd_ads.c
+++ b/source3/nsswitch/winbindd_ads.c
@@ -173,7 +173,7 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain,
goto done;
}
- rc = ads_search_retry(ads, &res, "(objectClass=user)", attrs);
+ rc = ads_search_retry(ads, &res, "(objectCategory=user)", attrs);
if (!ADS_ERR_OK(rc) || !res) {
DEBUG(1,("query_user_list ads_search: %s\n", ads_errstr(rc)));
goto done;
@@ -552,7 +552,7 @@ static NTSTATUS lookup_usergroups_alt(struct winbindd_domain *domain,
/* buggy server, no tokenGroups. Instead lookup what groups this user
is a member of by DN search on member*/
- if (!(ldap_exp = talloc_asprintf(mem_ctx, "(&(member=%s)(objectClass=group))", escaped_dn))) {
+ if (!(ldap_exp = talloc_asprintf(mem_ctx, "(&(member=%s)(objectCategory=group))", escaped_dn))) {
DEBUG(1,("lookup_usergroups(dn=%s) asprintf failed!\n", user_dn));
SAFE_FREE(escaped_dn);
status = NT_STATUS_NO_MEMORY;