2 files changed, 17 insertions, 7 deletions

diff --git a/gnu/usr.sbin/ypserv/server.c b/gnu/usr.sbin/ypserv/server.c
index bfa2e1a5cf89..8539ae763318 100644
--- a/gnu/usr.sbin/ypserv/server.c
+++ b/gnu/usr.sbin/ypserv/server.c
@@ -24,7 +24,7 @@
 ** Ported to FreeBSD and hacked all to pieces 
 ** by Bill Paul <wpaul@ctr.columbia.edu>
 **
-**	$Id: server.c,v 1.1 1995/01/31 08:58:53 wpaul Exp $
+**	$Id: server.c,v 1.2 1995/02/04 21:32:02 wpaul Exp $
 **
 */
 
@@ -48,6 +48,7 @@
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <signal.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 
@@ -789,6 +790,17 @@ static void print_ypmap_parms(const struct ypmap_parms *pp)
 
 
 /*
+** Clean up after ypxfr child processes signal their termination.
+*/
+void reapchild(sig)
+int sig;
+{
+    int st;
+
+    wait3(&st, WNOHANG, NULL);
+}
+
+/*
 ** Stole the ypxfr implementation from the yps package.
 */
 ypresp_xfr *ypproc_xfr_2_svc(ypreq_xfr *xfr,
@@ -855,9 +867,7 @@ ypresp_xfr *ypproc_xfr_2_svc(ypreq_xfr *xfr,
 	    result.xfrstat = YPXFR_XFRERR;
 	default:
 	{
-	    int st;
-
-	    wait4(-1, &st, WNOHANG, NULL);
+	    signal(SIGCHLD, reapchild);
 	    result.xfrstat = YPXFR_SUCC;
 	    break;
 	}
diff --git a/gnu/usr.sbin/ypserv/ypserv.8 b/gnu/usr.sbin/ypserv/ypserv.8
index 5b5ac91a851b..209db1fe1cd3 100644
--- a/gnu/usr.sbin/ypserv/ypserv.8
+++ b/gnu/usr.sbin/ypserv/ypserv.8
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id$
+.\"	$Id: ypserv.8,v 1.1 1995/02/04 21:32:04 wpaul Exp $
 .\"
 .Dd February 4, 1995
 .Dt YPSERV 8
@@ -64,7 +64,7 @@ Each client in an NIS domain must have its domainname set to
 one of the domains served by
 .Nm ypserv
 using the
-.Xr domainname 2
+.Xr domainname 1
 command. The clients must also run
 .Xr ypbind 8
 in order to attach to a particular server, since it is possible to
@@ -79,7 +79,7 @@ where
 is the name of the domain being served. There can be several
 such directories with different domainnames, and
 .Nm ypserv
-cam handle them all.
+can handle them all.
 .Pp
 The databases, or
 .Pa maps