From 3807a1dadf1905567d70a7dd2b6344b884cf0ef7 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Fri, 14 Feb 2003 00:31:30 +0000 Subject: Mop and bucket for trusted domain enumeration fix. (This used to be commit 5cfb30551a713caa3d69406450c1eac4541a30fa) --- source3/nsswitch/winbindd_util.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'source3/nsswitch/winbindd_util.c') diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c index 7a5fa3be20..99b94eac47 100644 --- a/source3/nsswitch/winbindd_util.c +++ b/source3/nsswitch/winbindd_util.c @@ -146,7 +146,7 @@ static struct winbindd_domain *add_trusted_domain(const char *domain_name, const /* rescan our domains looking for new trusted domains */ -void rescan_trusted_domains(void) +void rescan_trusted_domains(BOOL force) { struct winbindd_domain *domain; TALLOC_CTX *mem_ctx; @@ -157,11 +157,12 @@ void rescan_trusted_domains(void) if (!lp_allow_trusted_domains()) { return; } - - /* ony rescan every few minutes */ - if ((unsigned)(t - last_scan) < WINBINDD_RESCAN_FREQ) { + + /* Only rescan every few minutes but force if necessary */ + + if (((unsigned)(t - last_scan) < WINBINDD_RESCAN_FREQ) && !force) return; - } + last_scan = t; DEBUG(1, ("scanning trusted domain list\n")); @@ -217,7 +218,7 @@ BOOL init_domain_list(void) cache_methods.alternate_name(domain); /* do an initial scan for trusted domains */ - rescan_trusted_domains(); + rescan_trusted_domains(True); return True; } -- cgit