From e533c005b62f3e1016b5fb9a3b6973124480a54b Mon Sep 17 00:00:00 2001
Message-Id: <e533c005b62f3e1016b5fb9a3b6973124480a54b.1714174474.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Tue, 13 Mar 2012 02:30:57 +0000
Subject: [PATCH] server/privsep.c: Bring SIGCHLD handler in-line.
Organization: Straylight/Edgeware

From: Mark Wooding <mdw@distorted.org.uk>

---
 server/privsep.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/server/privsep.c b/server/privsep.c
index bbd4814a..d7063b63 100644
--- a/server/privsep.c
+++ b/server/privsep.c
@@ -32,6 +32,7 @@
 /*----- Static variables --------------------------------------------------*/
 
 static pid_t kid = -1;
+static sig sig_chld;
 
 /*----- Fetching a tunnel file descriptor ---------------------------------*/
 
@@ -128,7 +129,7 @@ lose:
  * Use:		Notices and reports child process death.
  */
 
-static void reap(int sig)
+static void reap(int sig, void *p)
 {
   pid_t k;
   int st;
@@ -185,7 +186,7 @@ void ps_split(int detachp)
   if (!helper) helper = PRIVSEP_HELPER;
   fdflags(fd[0], 0, 0, FD_CLOEXEC, FD_CLOEXEC);
   fdflags(fd[1], 0, 0, FD_CLOEXEC, FD_CLOEXEC);
-  signal(SIGCHLD, reap);
+  sig_add(&sig_chld, SIGCHLD, reap, 0);
   kid = fork();
   if (kid == 0) {
     signal(SIGCHLD, SIG_DFL);
-- 
[mdw]