From owner-svn-src-all@FreeBSD.ORG  Fri May  9 15:55:45 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 9D7C02E7;
 Fri,  9 May 2014 15:55:45 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8A1CE358;
 Fri,  9 May 2014 15:55:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s49FtjxC027560;
 Fri, 9 May 2014 15:55:45 GMT (envelope-from jh@svn.freebsd.org)
Received: (from jh@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s49FtjPI027558;
 Fri, 9 May 2014 15:55:45 GMT (envelope-from jh@svn.freebsd.org)
Message-Id: <201405091555.s49FtjPI027558@svn.freebsd.org>
From: Jaakko Heinonen <jh@FreeBSD.org>
Date: Fri, 9 May 2014 15:55:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r265781 - stable/10/usr.sbin/daemon
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 May 2014 15:55:45 -0000

Author: jh
Date: Fri May  9 15:55:45 2014
New Revision: 265781
URL: http://svnweb.freebsd.org/changeset/base/265781

Log:
  MFC r264194:
  
  Fork a child process and wait until the process terminates when the -P
  option is specified. This behavior is documented on the manual page.
  
  PR:		bin/187265

Modified:
  stable/10/usr.sbin/daemon/daemon.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/daemon/daemon.c
==============================================================================
--- stable/10/usr.sbin/daemon/daemon.c	Fri May  9 14:35:07 2014	(r265780)
+++ stable/10/usr.sbin/daemon/daemon.c	Fri May  9 15:55:45 2014	(r265781)
@@ -139,7 +139,7 @@ main(int argc, char *argv[])
 	 * get SIGCHLD eventually.
 	 */
 	pid = -1;
-	if (pidfile != NULL || restart) {
+	if (pidfile != NULL || ppidfile != NULL || restart) {
 		/*
 		 * Restore default action for SIGTERM in case the
 		 * parent process decided to ignore it.