[SCM] Samba Shared Repository - branch v3-6-test updated
Jeremy Allison
jra at samba.org
Wed Apr 6 16:34:43 MDT 2011
The branch, v3-6-test has been updated
via d19c9c1 Fix bug 6966 - "allow trusted domains = no" not respected in winbind.
from 27462a5 docs: fix the missing parameter description section in the smb.conf manpage
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit d19c9c1fdc52980664247220ff6d7fc520de690b
Author: Dmitry Butskoy <dmitry at butskoy.name>
Date: Wed Apr 6 13:52:42 2011 -0700
Fix bug 6966 - "allow trusted domains = no" not respected in winbind.
Autobuild-User: Jeremy Allison <jra at samba.org>
Autobuild-Date: Wed Apr 6 23:37:27 CEST 2011 on sn-devel-104
(cherry picked from commit 2db094fc32687dc2a869d753b50b2aa1636cdbd6)
-----------------------------------------------------------------------
Summary of changes:
source3/winbindd/winbindd.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 85abbd8..7ff26f3 100644
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -1022,7 +1022,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))
@@ -1104,11 +1103,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);
+ }
}
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list