  	}
  }
  
-@@ -589,12 +815,46 @@ master_main(char **argv, int waitattach,
+@@ -589,12 +824,46 @@ master_main(char **argv, int waitattach,
  {
  	int fd[2] = {-1, -1};
  	int s;

 	/* Make sure stdin/stdout/stderr point to /dev/null. We are now a
 	** daemon. */
 	nullfd = open("/dev/null", O_RDWR);
@@ -517,38 +683,15 @@ master_process(int s, char **argv, int w
 	if (nullfd > 2)
 		close(nullfd);
 

 /* Alarm handler for timeout waiting on client connect */
 static void
 	alarm_handler(int sig)
@@ -454,15 +530,80 @@ static void
 	exit(sig);
 }
 
