From owner-svn-src-head@FreeBSD.ORG  Mon Jun  4 09:22:22 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E24E7106564A;
	Mon,  4 Jun 2012 09:22:22 +0000 (UTC)
	(envelope-from trociny@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CDC868FC15;
	Mon,  4 Jun 2012 09:22:22 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q549MMnB017353;
	Mon, 4 Jun 2012 09:22:22 GMT (envelope-from trociny@svn.freebsd.org)
Received: (from trociny@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q549MMeF017351;
	Mon, 4 Jun 2012 09:22:22 GMT (envelope-from trociny@svn.freebsd.org)
Message-Id: <201206040922.q549MMeF017351@svn.freebsd.org>
From: Mikolaj Golub <trociny@FreeBSD.org>
Date: Mon, 4 Jun 2012 09:22:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r236550 - head/usr.sbin/daemon
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Jun 2012 09:22:23 -0000

Author: trociny
Date: Mon Jun  4 09:22:22 2012
New Revision: 236550
URL: http://svn.freebsd.org/changeset/base/236550

Log:
  On a child exit, call waitpid(2) to clean up the process table.
  
  Submitted by:	Andrey Zonov <andrey zonov.org>
  MFC after:	1 week

Modified:
  head/usr.sbin/daemon/daemon.c

Modified: head/usr.sbin/daemon/daemon.c
==============================================================================
--- head/usr.sbin/daemon/daemon.c	Mon Jun  4 08:40:14 2012	(r236549)
+++ head/usr.sbin/daemon/daemon.c	Mon Jun  4 09:22:22 2012	(r236550)
@@ -217,6 +217,10 @@ wait_child(pid_t pid, sigset_t *mask)
 		}
 		switch (signo) {
 		case SIGCHLD:
+			if (waitpid(pid, NULL, WNOHANG) == -1) {
+				warn("waitpid");
+				return (-1);
+			}
 			return (terminate);
 		case SIGTERM:
 			terminate = 1;