ha-callout ands sigchld

diff --git a/ChangeLog b/ChangeLog
index fed8afe50f7e1c5448bb9719ec43ab885029b91a..956284485b08edd246049d582ee4eb1a1cc5997c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@
 2004-12-06 Paul Clements <paul.clements@steeleye.com>  
        * support/include/ha-callout.h: get return status from waitpid
        correctly. 
+       * support/include/ha-callout.h: don't ignore SIGCHLD while waiting
+       for a callout to complete.
        * utils/statd/statd.c(sigusr): print current start when re-reading
        notify list due to SIGUSR1
        * utils/statd/svc_run.c(my_svc_run): call change_state when

diff --git a/support/include/ha-callout.h b/support/include/ha-callout.h
index 8acf0ded2a4b4bfeaf5c51042fe615aa9940bb10..64a430d94ec7e9e1ab9df360f01168fa853240c5 100644 (file)
--- a/support/include/ha-callout.h
+++ b/support/include/ha-callout.h
@@ -14,6 +14,7 @@
 #define HA_CALLOUT_H
 
 #include <sys/wait.h>
+#include <signal.h>
 
 extern char *ha_callout_prog;
 
@@ -23,12 +24,22 @@ ha_callout(char *event, char *arg1, char *arg2, int arg3)
        char buf[16]; /* should be plenty */
        pid_t pid;
        int ret = -1;
+       struct sigaction oldact, newact;
 
        if (!ha_callout_prog) /* HA callout is not enabled */
                return;
 
        sprintf(buf, "%d", arg3);
 
+       /* many daemons ignore SIGCHLD as tcpwrappers will
+        * fork a child to do logging.  We need to wait
+        * for a child here, so we need to un-ignore
+        * SIGCHLD temporarily
+        */
+       newact.sa_handler = SIG_DFL;
+       newacc.sa_flags = 0;
+       sigemptyset(&newact.sa_mask);
+       sigaction(SIGCHLD, &newact, &oldact);
        pid = fork();
        switch (pid) {
                case 0: execl(ha_callout_prog, ha_callout_prog,
@@ -41,7 +52,7 @@ ha_callout(char *event, char *arg1, char *arg2, int arg3)
                        break;
                default: pid = waitpid(pid, &ret, 0);
        }
-
+       sigaction(SIGCHLD, &oldact, &newact);
 #ifdef dprintf
        dprintf(N_DEBUG, "ha callout returned %d\n", WEXITSTATUS(ret));
 #else