From 2db094fc32687dc2a869d753b50b2aa1636cdbd6 Mon Sep 17 00:00:00 2001
From: Dmitry Butskoy <dmitry@butskoy.name>
Date: Wed, 6 Apr 2011 13:52:42 -0700
Subject: Fix bug 6966 - "allow trusted domains = no" not respected in winbind.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Wed Apr 6 23:37:27 CEST 2011 on sn-devel-104
---
source3/winbindd/winbindd.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
(limited to 'source3/winbindd')
diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 83324b0f95..fc6ea9378c 100644
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -1013,7 +1013,6 @@ bool winbindd_use_cache(void)
void winbindd_register_handlers(void)
{
- struct tevent_timer *te;
/* Setup signal handlers */
if (!winbindd_setup_sig_term_handler(true))
@@ -1095,11 +1094,12 @@ void winbindd_register_handlers(void)
smb_nscd_flush_user_cache();
smb_nscd_flush_group_cache();
- te = tevent_add_timer(winbind_event_context(), NULL, timeval_zero(),
- rescan_trusted_domains, NULL);
- if (te == NULL) {
- DEBUG(0, ("Could not trigger rescan_trusted_domains()\n"));
- exit(1);
+ if (lp_allow_trusted_domains()) {
+ if (tevent_add_timer(winbind_event_context(), NULL, timeval_zero(),
+ rescan_trusted_domains, NULL) == NULL) {
+ DEBUG(0, ("Could not trigger rescan_trusted_domains()\n"));
+ exit(1);
+ }
}
}
--
cgit