[SCM] Samba Shared Repository - branch master updated
Jeremy Allison
jra at samba.org
Wed Apr 6 15:38:02 MDT 2011
The branch, master has been updated
via 2db094f Fix bug 6966 - "allow trusted domains = no" not respected in winbind.
from b3bb983 s4:dsdb/repl_meta_data: update replPropertyMetaData on originating renames
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 2db094fc32687dc2a869d753b50b2aa1636cdbd6
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
-----------------------------------------------------------------------
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 83324b0..fc6ea93 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);
+ }
}
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list