Merge branch 'jc/upload-corrupt' into next

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

diff --git a/daemon.c b/daemon.c
index a19b7b5aaad228396f08b00c9925c555859393b4..1ba4d669da346abb5dab86ea7842a7ad4d3e1cde 100644 (file)
--- a/daemon.c
+++ b/daemon.c
@@ -762,7 +762,7 @@ int main(int argc, char **argv)
                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;