summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjh <jh@FreeBSD.org>2014-05-09 15:55:45 +0000
committerjh <jh@FreeBSD.org>2014-05-09 15:55:45 +0000
commit93d38c10ec01ca2fb5426ce5f923955b759f0f2a (patch)
treeee2e7d73341cd778ca56011934710103a45c8982
parent384378af24deb17292071bd9c96e11acb17a1965 (diff)
downloadFreeBSD-src-93d38c10ec01ca2fb5426ce5f923955b759f0f2a.zip
FreeBSD-src-93d38c10ec01ca2fb5426ce5f923955b759f0f2a.tar.gz
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
-rw-r--r--usr.sbin/daemon/daemon.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c
index 322c0d4..7bdd2a6 100644
--- a/usr.sbin/daemon/daemon.c
+++ b/usr.sbin/daemon/daemon.c
@@ -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.
OpenPOWER on IntegriCloud