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

Timestamp:

Aug 2, 2010, 8:16:45 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: trunk update to 3.5.4

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/winbindd/winbindd.c (modified) (3 diffs)

trunk/server/source3/winbindd/winbindd.c

@@ -373 +373 @@
         uint8 ret;
         pid_t child_pid;
-        struct sigaction act;
-        struct sigaction oldact;
 
         DEBUG(10, ("winbindd_msg_validate_cache: got validate-cache "
@@ -384 +382 @@
          * code can safely use fork/waitpid...
          */
-        CatchChild();
         child_pid = sys_fork();
 
@@ -402 +399 @@
         /* child */
 
+        if (!winbindd_reinit_after_fork(NULL)) {
+                _exit(0);
+        }
+
         /* install default SIGCHLD handler: validation code uses fork/waitpid */
-        ZERO_STRUCT(act);
-        act.sa_handler = SIG_DFL;
-#ifdef SA_RESTART
-        /* We *want* SIGALRM to interrupt a system call. */
-        act.sa_flags = SA_RESTART;
-#endif
-        sigemptyset(&act.sa_mask);
-        sigaddset(&act.sa_mask,SIGCHLD);
-        sigaction(SIGCHLD,&act,&oldact);
+        CatchSignal(SIGCHLD, SIG_DFL);
 
         ret = (uint8)winbindd_validate_cache_nobackup();