diff options
| author | Dmitry Butskoy <dmitry@butskoy.name> | 2011-04-06 13:52:42 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2011-04-06 23:37:27 +0200 |
| commit | 2db094fc32687dc2a869d753b50b2aa1636cdbd6 (patch) | |
| tree | 01508fbcdce08d7451f83502e0f7996071b52678 /source3/winbindd | |
| parent | b3bb983f256e3a48dafea309800fac1a42648157 (diff) | |
| download | samba-2db094fc32687dc2a869d753b50b2aa1636cdbd6.tar.gz samba-2db094fc32687dc2a869d753b50b2aa1636cdbd6.tar.bz2 samba-2db094fc32687dc2a869d753b50b2aa1636cdbd6.zip | |
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
Diffstat (limited to 'source3/winbindd')
| -rw-r--r-- | source3/winbindd/winbindd.c | 12 |
1 files changed, 6 insertions, 6 deletions
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); + } } } |