if trusted domains are disabled then we should not try to connect to

them in winbindd
(This used to be commit 6c7748b001836e4aa3e23dedfe28db3c8acc197a)

diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c
index c8afea2f7286a307fe5c600ab00d8be31d59fd75..fd3e547afb0c9bf2119dd31af93522824e62ba9f 100644 (file)
--- 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")))