From: Andrew Bartlett Date: Fri, 18 May 2012 12:02:57 +0000 (+1000) Subject: s3-utils: Use ads_do_search_retry in net ads search X-Git-Tag: samba-3.5.16~19 X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=3239ce4b352c25c5c29c8158b6ebb2ef635c3565 s3-utils: Use ads_do_search_retry in net ads search This makes it possible to search against a slow server, as will fallback from 1000 to (eventually) 125 users at a time. Andrew Bartlett The last 4 patches addres bug #8943 (Slow but responsive DC can lock up winbindd for > 10 minutes at a time). (cherry picked from commit 76c570fe6be4d6b5b254ec3264a97cb13864a6df) --- diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c index 83aef18cef1..e5e76be71a9 100644 --- a/source3/utils/net_ads.c +++ b/source3/utils/net_ads.c @@ -2156,7 +2156,7 @@ static int net_ads_search(struct net_context *c, int argc, const char **argv) ldap_exp = argv[0]; attrs = (argv + 1); - rc = ads_do_search_all(ads, ads->config.bind_path, + rc = ads_do_search_retry(ads, ads->config.bind_path, LDAP_SCOPE_SUBTREE, ldap_exp, attrs, &res); if (!ADS_ERR_OK(rc)) {