Changeset 134 for branches/samba-3.0/source/nsswitch/winbindd_dual.c

Timestamp:

May 23, 2008, 6:56:41 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.29

File:

• branches/samba-3.0/source/nsswitch/winbindd_dual.c (modified) (5 diffs)

branches/samba-3.0/source/nsswitch/winbindd_dual.c

@@ -528 +528 @@
         }
 
+        /* This will be re-added in fork_domain_child() */
+
+        DLIST_REMOVE(children, child);
+        
         remove_fd_event(&child->event);
         close(child->event.fd);
@@ -893 +897 @@
         ZERO_STRUCT(state);
         state.pid = sys_getpid();
-
-        /* Stop zombies */
-        CatchChild();
 
         /* Ensure we don't process messages whilst we're
@@ -925 +926 @@
         /* Child */
 
+        /* Stop zombies in children */
+        CatchChild();
+
         state.sock = fdpair[0];
         close(fdpair[1]);
@@ -995 +999 @@
 
         if (child->domain && child->domain->internal && IS_DC) {
-                child->domain->internal = False;
                 child->domain->methods = &cache_methods;
                 child->domain->online = False;
@@ -1011 +1014 @@
                 lp_TALLOC_FREE();
                 main_loop_TALLOC_FREE();
+
+                /* check for signals */
+                winbind_check_sigterm();
+                winbind_check_sighup();
 
                 run_events(winbind_event_context(), 0, NULL, NULL);