Changeset 599 for trunk/server/source3/winbindd/winbindd.c

Timestamp:

Jul 6, 2011, 8:21:13 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.9

File:

• trunk/server/source3/winbindd/winbindd.c (modified) (2 diffs)

trunk/server/source3/winbindd/winbindd.c

@@ -1014 +1014 @@
         int opt;
         TALLOC_CTX *frame = talloc_stackframe();
-        struct tevent_timer *te;
 
         /* glibc (?) likes to print "User defined signal 1" and exit if a
@@ -1261 +1260 @@
         }
 
-        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);
+                }
         }