From: Matthias Lederhofer <matled@gmx.net>
Date: Thu, 13 Jul 2006 16:32:11 +0000 (+0200)
Subject: daemon: if one of the standard fds is missing open it to /dev/null
X-Git-Tag: v1.4.2-rc1~18
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=258e93a155f88fd7385e4d1e26f287044ba973e9;p=git.git

daemon: if one of the standard fds is missing open it to /dev/null

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/daemon.c b/daemon.c
index a7636bc50..01ccda33e 100644
--- a/daemon.c
+++ b/daemon.c
@@ -662,6 +662,18 @@ static int service_loop(int socknum, int *socklist)
 	}
 }
 
+/* if any standard file descriptor is missing open it to /dev/null */
+static void sanitize_stdfds(void)
+{
+	int fd = open("/dev/null", O_RDWR, 0);
+	while (fd != -1 && fd < 2)
+		fd = dup(fd);
+	if (fd == -1)
+		die("open /dev/null or dup failed: %s", strerror(errno));
+	if (fd > 2)
+		close(fd);
+}
+
 static int serve(int port)
 {
 	int socknum, *socklist;
@@ -773,5 +785,7 @@ int main(int argc, char **argv)
 		return execute(peer);
 	}
 
+	sanitize_stdfds();
+
 	return serve(port);
 }