From 93871c6cff22231c94f14455f7896334d0547627 Mon Sep 17 00:00:00 2001 From: Ihor Antonov Date: Wed, 1 Mar 2023 21:00:42 -0600 Subject: daemon: fix double init of pid variable Reviewed by: kevans Pull Request: https://github.com/freebsd/freebsd-src/pull/669 (cherry picked from commit 91b921c7d4684599d1d983f77dcc3df90900adc0) --- usr.sbin/daemon/daemon.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index 9477b2a415e8..4fe749d9e5fa 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -81,7 +81,7 @@ static void daemon_sleep(time_t, long); static volatile sig_atomic_t terminate = 0; static volatile sig_atomic_t child_gone = 0; -static volatile sig_atomic_t pid = 0; +static volatile sig_atomic_t pid = -1; static volatile sig_atomic_t do_log_reopen = 0; static const char shortopts[] = "+cfHSp:P:ru:o:s:l:t:m:R:T:h"; @@ -286,7 +286,6 @@ main(int argc, char *argv[]) * readable pipe with the child for writing to a log file * and syslog. */ - pid = -1; if (pidfile || ppidfile || restart || outfd != -1 || dosyslog) { struct sigaction act_term, act_chld, act_hup; -- cgit v1.2.3