Merge branch 'jn/web' into next

diff --git a/daemon.c b/daemon.c
index 776749e3432fca916981d73d04a1fa19ed3d88b8..10670047f267e86a6831562749914a8cf4187334 100644 (file)
--- a/daemon.c
+++ b/daemon.c
@@ -267,12 +267,17 @@ static int upload(char *dir)
 static int execute(void)
 {
        static char line[1000];
-       int len;
+       int pktlen, len;
 
        alarm(init_timeout ? init_timeout : timeout);
-       len = packet_read_line(0, line, sizeof(line));
+       pktlen = packet_read_line(0, line, sizeof(line));
        alarm(0);
 
+       len = strlen(line);
+       if (pktlen != len)
+               loginfo("Extended attributes (%d bytes) exist <%.*s>",
+                       (int) pktlen - len,
+                       (int) pktlen - len, line + len + 1);
        if (len && line[len-1] == '\n')
                line[--len] = 0;
 
@@ -666,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];