1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-27 03:21:53 +03:00

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
This commit is contained in:
Dmitry Butskoy 2011-04-06 13:52:42 -07:00 committed by Jeremy Allison
parent b3bb983f25
commit 2db094fc32

View File

@ -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);
}
}
}