From nobody Thu Mar 2 03:01:02 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PRwpk5Mwvz3vjxR; Thu, 2 Mar 2023 03:01:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PRwpk3js3z44BC; Thu, 2 Mar 2023 03:01:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677726062; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ejq0rbQetekYKZHOGt+y5qtCZFezjvufyaztaazTJ+A=; b=nL+ZHXX0TclnfGSkqV85oXiW8FKpgyBrlNyvXo8c5JOWFlS1p/B4CZWaPgb+zj990ztWeg OguKn+0C2BLeOzWT0dWgWUaXbtkUllI17hnbWsr996cjGty6ZCwHEHSBbI7gbhWUMDVGvU v/BPZq3fNAbkdbSsQIJGkWmGX6pUgh3hElHR85sOefGEXUR9NkkXbuXhOrKbkRqL6Pawsh FYZ10jm9ertnvOP452EXCSGqQ02GXtBsczBTs45JvVYN5WrXxmD9AHecVSqVVZlWV+t57g P4bx2GDK14lD6JBkEkEEQKs4u+D/jMiXj4MZCXVT9vKhdlglsk2VFf6zidNC1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677726062; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ejq0rbQetekYKZHOGt+y5qtCZFezjvufyaztaazTJ+A=; b=itykquTKfmw5MxfSFgC2VQwuCL5uroOgASWAgbaIKZbMep3djiJihDZdD8Zajn6TtZeCDo rlZn+hUF/xolLor+IktiJO7LlBSwtqYbL+2PUFCaDDG1WjF+EtcccM+RF0pz7/U6nW0YLi Et1UwEL/cFZ6r5cOv/SWZHbWBFn/HIsApZMR0l8QP6O86KQTAJ0bTgfuvYm/hxB8v/qQQn SrgzmARp3SDIjBPEWAK3Wcg01vvlhJ6+xqB39BECIYmpnHh3lTRm1/4fbVdPpjf1URXVzr M9xNXqOxLOnDmenjgCa9ivjZ/raG2BKATkuMop1jBV+jWZad2JXjvseNIgpWrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677726062; a=rsa-sha256; cv=none; b=QU2qKCoB/l7F/t/+z9nwoIHv3+sUNhcbW8XAEZWas1qoCxlB0uWBCvZ1nYTe7kkTGLUatF 6sUBHlBCNbRskqUYEzC2Ych+ir4+umX21NkAf/mLqQ63FFYFwHjtvb18CdSJnu04E+GvbJ mU9CKwkYMvSbgR+OFxJUgTLF2hSCXjA6Sv4ce525JOUkXZB7rCtSF7m5VARf7ADuFBuPqI 00maUIw0RhfnNpGdTtrLevXn5DlGA63rMe+/Xm+eHI1yLFv9gUju7pezhk/NtAuDl8LS7G xn7byzYY0Z8JMK41yjppETB1NwUXIwe1dEs2/VgHAeobBSYIR6SoQq5EGvq1Gw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRwpk2q1FzyvH; Thu, 2 Mar 2023 03:01:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 322312Of033992; Thu, 2 Mar 2023 03:01:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322312UB033985; Thu, 2 Mar 2023 03:01:02 GMT (envelope-from git) Date: Thu, 2 Mar 2023 03:01:02 GMT Message-Id: <202303020301.322312UB033985@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 91b921c7d468 - main - daemon: fix double init of pid variable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 91b921c7d4684599d1d983f77dcc3df90900adc0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=91b921c7d4684599d1d983f77dcc3df90900adc0 commit 91b921c7d4684599d1d983f77dcc3df90900adc0 Author: Ihor Antonov AuthorDate: 2023-03-02 03:00:42 +0000 Commit: Kyle Evans CommitDate: 2023-03-02 03:00:42 +0000 daemon: fix double init of pid variable Reviewed by: kevans Pull Request: https://github.com/freebsd/freebsd-src/pull/669 --- 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;