Instead of ignoring SIG_CHLD, reap zombies in the signal handler.

1 files changed, 9 insertions, 8 deletions

diff --git a/socket.c b/socket.c
index eb0660bb..cb15441f 100644
--- a/socket.c
+++ b/socket.c
@@ -374,6 +374,14 @@ int is_a_socket(int fd)
 }
 
 
+static RETSIGTYPE sigchld_handler(int UNUSED(val)) {
+	signal(SIGCHLD, sigchld_handler);
+#ifdef WNOHANG
+	while (waitpid(-1, NULL, WNOHANG) > 0) {}
+#endif
+}
+
+
 void start_accept_loop(int port, int (*fn)(int, int))
 {
 	int s;
@@ -419,14 +427,7 @@ void start_accept_loop(int port, int (*fn)(int, int))
 
 		if (fd == -1) continue;
 
-		signal(SIGCHLD, SIG_IGN);
-
-		/* we shouldn't have any children left hanging around
-		   but I have had reports that on Digital Unix zombies
-		   are produced, so this ensures that they are reaped */
-#ifdef WNOHANG
-                while (waitpid(-1, NULL, WNOHANG) > 0);
-#endif
+		signal(SIGCHLD, sigchld_handler);
 
 		if ((pid = fork()) == 0) {
 			int ret;