sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

r15460: Prefer to use the indexed objectCategory attribute (instead of

Browse Source 
objectClass which is not indexed on AD) in LDAP queries.

Guenther
This commit is contained in:
Günther Deschner 2006-05-05 15:44:00 +00:00 committed by Gerald (Jerry) Carter
parent 870495e2c8
commit 847882a983
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/nsswitch/winbindd_ads.c
View File

@ -173,7 +173,7 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain,
goto done; 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) { if (!ADS_ERR_OK(rc) || !res) {
DEBUG(1,("query_user_list ads_search: %s\n", ads_errstr(rc))); DEBUG(1,("query_user_list ads_search: %s\n", ads_errstr(rc)));
goto done; 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 /* buggy server, no tokenGroups. Instead lookup what groups this user
is a member of by DN search on member*/ 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)); DEBUG(1,("lookup_usergroups(dn=%s) asprintf failed!\n", user_dn));
SAFE_FREE(escaped_dn); SAFE_FREE(escaped_dn);
status = NT_STATUS_NO_MEMORY; status = NT_STATUS_NO_MEMORY;

4
source/utils/net_ads.c
View File

@ -473,7 +473,7 @@ int net_ads_user(int argc, const char **argv)
rc = ads_do_search_all_fn(ads, ads->config.bind_path, rc = ads_do_search_all_fn(ads, ads->config.bind_path,
LDAP_SCOPE_SUBTREE, LDAP_SCOPE_SUBTREE,
"(objectclass=user)", "(objectCategory=user)",
opt_long_list_entries ? longattrs : opt_long_list_entries ? longattrs :
shortattrs, usergrp_display, shortattrs, usergrp_display,
disp_fields); disp_fields);
@ -597,7 +597,7 @@ int net_ads_group(int argc, const char **argv)
"\n-----------------------------\n"); "\n-----------------------------\n");
rc = ads_do_search_all_fn(ads, ads->config.bind_path, rc = ads_do_search_all_fn(ads, ads->config.bind_path,
LDAP_SCOPE_SUBTREE, LDAP_SCOPE_SUBTREE,
"(objectclass=group)", "(objectCategory=group)",
opt_long_list_entries ? longattrs : opt_long_list_entries ? longattrs :
shortattrs, usergrp_display, shortattrs, usergrp_display,
disp_fields); disp_fields);