- 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)

diff --git a/source3/nsswitch/winbindd.c b/source3/nsswitch/winbindd.c
index d394a57837d45868c972d0c65d78ac4fe0d0073b..5b9c5418a17305bd40f0c4be03a0ed16c3575312 100644 (file)
--- 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 00354187aa64ef0c9ff7c8229c8edacb0760196e..c8afea2f7286a307fe5c600ab00d8be31d59fd75 100644 (file)
--- 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"));