winbindd: remove automatic trusts enumeration
authorStefan Metzmacher <metze@samba.org>
Wed, 29 Nov 2017 15:02:28 +0000 (16:02 +0100)
committerStefan Metzmacher <metze@samba.org>
Tue, 29 Oct 2019 13:33:03 +0000 (14:33 +0100)
source3/winbindd/winbindd.c

index 59b4ffc684bb29d26741441092cbd0d744d3912c..8053e8d13fc6f8d67026ebd3f0d609c13e65088a 100644 (file)
@@ -1385,7 +1385,6 @@ bool winbindd_use_cache(void)
 static void winbindd_register_handlers(struct messaging_context *msg_ctx,
                                       bool foreground)
 {
-       bool scan_trusts = true;
        NTSTATUS status;
        /* Setup signal handlers */
 
@@ -1469,26 +1468,6 @@ static void winbindd_register_handlers(struct messaging_context *msg_ctx,
        smb_nscd_flush_user_cache();
        smb_nscd_flush_group_cache();
 
-       if (!lp_winbind_scan_trusted_domains()) {
-               scan_trusts = false;
-       }
-
-       if (!lp_allow_trusted_domains()) {
-               scan_trusts = false;
-       }
-
-       if (IS_DC) {
-               scan_trusts = false;
-       }
-
-       if (scan_trusts) {
-               if (tevent_add_timer(global_event_context(), NULL, timeval_zero(),
-                             rescan_trusted_domains, NULL) == NULL) {
-                       DEBUG(0, ("Could not trigger rescan_trusted_domains()\n"));
-                       exit(1);
-               }
-       }
-
        status = wb_irpc_register();
 
        if (!NT_STATUS_IS_OK(status)) {