Merge branch 'jn/web' into next

diff --git a/daemon.c b/daemon.c
index 2f03f99d2d9f2ed9a23932e5104456f69b721116..10670047f267e86a6831562749914a8cf4187334 100644 (file)
--- a/daemon.c
+++ b/daemon.c
@@ -671,6 +671,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];