3 files changed, 10 insertions, 2 deletions

diff --git a/gnu/usr.sbin/ypserv/server.c b/gnu/usr.sbin/ypserv/server.c
index 27b88e33d3bd..5b16cfd676e4 100644
--- a/gnu/usr.sbin/ypserv/server.c
+++ b/gnu/usr.sbin/ypserv/server.c
@@ -152,7 +152,7 @@ static int is_valid_host(struct sockaddr_in *sin)
 		       inet_ntoa(sin->sin_addr),
 		       "");
 
-    if (sin->sin_addr.s_addr != oldaddr || status != oldstatus ) {
+    if (!status && (sin->sin_addr.s_addr != oldaddr || status != oldstatus)) {
 	syslog(status?allow_severity:deny_severity,
 	       "%sconnect from %s\n",status?"":"refused ",
 	       h?h:inet_ntoa(sin->sin_addr));
diff --git a/gnu/usr.sbin/ypserv/svc_run.c b/gnu/usr.sbin/ypserv/svc_run.c
index 9b7357ac8674..6f4a52c0b8a6 100644
--- a/gnu/usr.sbin/ypserv/svc_run.c
+++ b/gnu/usr.sbin/ypserv/svc_run.c
@@ -55,6 +55,10 @@ my_svc_run()
 #endif /* def FD_SETSIZE */
 	extern int errno;
 	extern int forked;
+	int pid;
+
+	/* Establish the identity of the parent ypserv process. */
+	pid = getpid();
 
 	for (;;) {
 #ifdef FD_SETSIZE
@@ -74,7 +78,7 @@ my_svc_run()
 			continue;
 		default:
 			svc_getreqset(&readfds);
-			if (forked)
+			if (forked && pid != getpid())
 				exit(0);
 		}
 	}
diff --git a/gnu/usr.sbin/ypserv/yp_svc.c b/gnu/usr.sbin/ypserv/yp_svc.c
index b6d8ec5f1c30..5e150890e116 100644
--- a/gnu/usr.sbin/ypserv/yp_svc.c
+++ b/gnu/usr.sbin/ypserv/yp_svc.c
@@ -322,8 +322,12 @@ int main(int argc, char **argv)
      * Ignore SIGPIPEs. They can hurt us if someone does a ypcat
      * and then hits CTRL-C before it terminates.
      */
+    sigaction(SIGPIPE, NULL, &sa);
     sa.sa_handler = SIG_IGN;
+    sa.sa_flags |= SA_RESTART;
     sigaction(SIGPIPE, &sa, NULL);
+    sigaction(SIGCHLD, NULL, &sa);
+    sa.sa_flags |= SA_RESTART;
     sa.sa_handler = reapchild;
     sigaction(SIGCHLD, &sa, NULL);