Merge branch 'jc/upload-corrupt' into next

* jc/upload-corrupt:
daemon: send stderr to /dev/null instead of closing.

diff --combined daemon.c
index a19b7b5aaad228396f08b00c9925c555859393b4,0747ce2a37ac90cd89044ab9e5aac688f0e1a269..1ba4d669da346abb5dab86ea7842a7ad4d3e1cde
--- 1/daemon.c
--- 2/daemon.c
+++ b/daemon.c
@@@ -673,11 -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];
  
@@@ -762,7 -757,7 +762,7 @@@
                struct sockaddr *peer = (struct sockaddr *)&ss;
                socklen_t slen = sizeof(ss);
  
-               fclose(stderr); //FIXME: workaround
+               freopen("/dev/null", "w", stderr);
  
                if (getpeername(0, peer, &slen))
                        peer = NULL;