Date: Sat, 14 Jun 2014 01:32:48 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r267463 - stable/9/usr.sbin/daemon Message-ID: <201406140132.s5E1Wm1s048284@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emaste Date: Sat Jun 14 01:32:48 2014 New Revision: 267463 URL: http://svnweb.freebsd.org/changeset/base/267463 Log: MFC r264194: fix handling of -P without -p or -r 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: 187265, 190643 Approved by: re Modified: stable/9/usr.sbin/daemon/daemon.c Directory Properties: stable/9/usr.sbin/daemon/ (props changed) Modified: stable/9/usr.sbin/daemon/daemon.c ============================================================================== --- stable/9/usr.sbin/daemon/daemon.c Sat Jun 14 01:24:22 2014 (r267462) +++ stable/9/usr.sbin/daemon/daemon.c Sat Jun 14 01:32:48 2014 (r267463) @@ -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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406140132.s5E1Wm1s048284>