From d0c11644dc751f8a27efaa318f48064e43cc5eb2 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 15 Oct 2002 23:44:15 +0000 Subject: - we need to rescan the trusted domain list regularly to cope with transitive trusts, and trusts that are added while winbindd is running - removed an unnecessary call to time() (This used to be commit 14489ff30bb9eca2c55d36a69c0b45a2db339061) --- source3/nsswitch/winbindd.c | 4 ++++ source3/nsswitch/winbindd_util.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/source3/nsswitch/winbindd.c b/source3/nsswitch/winbindd.c index d394a57837..5b9c5418a1 100644 --- a/source3/nsswitch/winbindd.c +++ b/source3/nsswitch/winbindd.c @@ -521,6 +521,10 @@ static void process_loop(int accept_sock) message_dispatch(); + /* rescan the trusted domains list. This must be done + regularly to cope with transitive trusts */ + rescan_trusted_domains(); + /* Free up temporary memory */ lp_talloc_free(); diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c index 00354187aa..c8afea2f72 100644 --- a/source3/nsswitch/winbindd_util.c +++ b/source3/nsswitch/winbindd_util.c @@ -157,7 +157,7 @@ void rescan_trusted_domains(void) if ((unsigned)(t - last_scan) < WINBINDD_RESCAN_FREQ) { return; } - last_scan = time(NULL); + last_scan = t; DEBUG(1, ("scanning trusted domain list\n")); -- cgit