Merge branch 'jc/waitpid'

diff --git a/daemon.c b/daemon.c
index bdfe80d2e4f4fc13ad45bd35aeeeb3ec71422a4f..a19b7b5aaad228396f08b00c9925c555859393b4 100644 (file)
--- a/daemon.c
+++ b/daemon.c
@@ -673,6 +673,11 @@ int main(int argc, char **argv)
        int inetd_mode = 0;
        int i;
 
+       /* Without this we cannot rely on waitpid() to tell
+        * what happened to our children.
+        */
+       signal(SIGCHLD, SIG_DFL);
+
        for (i = 1; i < argc; i++) {
                char *arg = argv[i];