The branch, v3-5-test has been updated
via 66de22f Fix bug 6966 - "allow trusted domains = no" not respected
in winbind.
from 4a46715 s3: Fix bug 8066, wrong output in smbget
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -----------------------------------------------------------------
commit 66de22f7b242ae9e3358d33e580547c2618bd918
Author: Dmitry Butskoy <dmi...@butskoy.name>
Date: Mon Apr 18 14:14:09 2011 -0700
Fix bug 6966 - "allow trusted domains = no" not respected in winbind.
-----------------------------------------------------------------------
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 9c676f0..70749c5 100644
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -1013,7 +1013,6 @@ int main(int argc, char **argv, char **envp)
poptContext pc;
int opt;
TALLOC_CTX *frame = talloc_stackframe();
- struct tevent_timer *te;
/* glibc (?) likes to print "User defined signal 1" and exit if a
SIGUSR[12] is received before a handler is installed */
@@ -1260,11 +1259,12 @@ int main(int argc, char **argv, char **envp)
exit(1);
}
- 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);
+ }
}
TALLOC_FREE(frame);
--
Samba Shared Repository
