Merge branch 'jc/upload-corrupt' into next

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

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;