From ef372e36f08c8cd370c1a8a70c60b045c4e736c3 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 23 Oct 2002 00:23:30 +0000 Subject: if trusted domains are disabled then we should not try to connect to them in winbindd (This used to be commit 6c7748b001836e4aa3e23dedfe28db3c8acc197a) --- source3/nsswitch/winbindd_util.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'source3/nsswitch') diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c index c8afea2f72..fd3e547afb 100644 --- a/source3/nsswitch/winbindd_util.c +++ b/source3/nsswitch/winbindd_util.c @@ -153,12 +153,17 @@ void rescan_trusted_domains(void) static time_t last_scan; time_t t = time(NULL); + /* trusted domains might be disabled */ + if (!lp_allow_trusted_domains()) { + return; + } + /* ony rescan every few minutes */ if ((unsigned)(t - last_scan) < WINBINDD_RESCAN_FREQ) { return; } last_scan = t; - + DEBUG(1, ("scanning trusted domain list\n")); if (!(mem_ctx = talloc_init_named("init_domain_list"))) -- cgit