svn commit: r264194 - head/usr.sbin/daemon

[Jaakko Heinonen]

Author: jh
Date: Sun Apr  6 16:35:49 2014
New Revision: 264194
URL: http://svnweb.freebsd.org/changeset/base/264194

Log:
  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
  Submitted by:	Kimo R
  MFC after:	2 weeks

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

Modified: head/usr.sbin/daemon/daemon.c
==============================================================================
--- head/usr.sbin/daemon/daemon.c	Sun Apr  6 16:31:28 2014	(r264193)
+++ head/usr.sbin/daemon/daemon.c	Sun Apr  6 16:35:49 2014	(r264194)
@@ -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.