From nobody Wed Jul 30 22:32:18 2025 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 4bsn5b1sPzz637G1; Wed, 30 Jul 2025 22:32:19 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bsn5b0V9bz3kK0; Wed, 30 Jul 2025 22:32:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753914739; 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=QlWe9z3WUOQugdG2IxP+zkFNw3/wQErG4rcNJofakIA=; b=Ull5ApWhPCaTfK+WZsqrC1nNVmoKnbqTRM4StmoNDWfjKlL9yX6CIg4YXlAYIpRZFKFO8Y Tiz4SF5X7ibPTuhuVlhLZ1oyNBjrZIC5OhdS2KunFLeBM2+nvbAo3n3vujnZYVpwtwUW5g CHEsNxGfCbBY7/biFanfSe+WgPzwEpYugghd1IDngHl4YMTBsEwxkXcQ79e6ltMEmcjnb1 nHdmJa1CbE2chNhyet7nkTBOz8w5JQ8eMz99nn+JfUWJwtMM4mbZdo74V1JSaLrurzrGe8 vPYDb1rR8EZV1ySc4rRw8jnnS/DKRB0QcTjO6CBBEYPgMYglX4IMrnFrDHeWqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753914739; 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=QlWe9z3WUOQugdG2IxP+zkFNw3/wQErG4rcNJofakIA=; b=Bg0Wj/xBk3JZrF531BMMpPQVzOlDIXxk1iDC0GnJ5nYAm2euHt1MmLQNUqAA0YcctsnC6S 42CKUKY5xBXfWVJCFrYxOWINKs//YdpBRw4U/IAtMjqAEUiegqpTxEQyslR542xtIQsFHt LERS8GKB4uS2Oqa5IN46bJUg7TVw3ZRSlgZTsmmP04P5VfFPJNhF+vNOHOeQ+p21ixgsLJ QFBFQQI19tb0tuh1N1TcglKZrJIEibRVr0wGxZxZ48fnMZ8VOIWcIjm/pv/wPBYEkKunN4 y3pITL0InuB1dgKq157H4JhCY4kSKZdk4Il7lhDStunTbFZwRdYLqNE2GeXPdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753914739; a=rsa-sha256; cv=none; b=OEDFNyKetF572LcZpnk0vIcp75uGRvrnXYZOCFhhlQwI+lqnThMl97woxRSvWdijG+5t8a fHsYTGvjIF2INtJ/PwLDqGp1MHuv1Ic4zjehaQokcP92sunk2v/o+godJ/nzl4Z0KYXPKh l2VdjiyOtVVPAd6OFo2FvDDfIPjMyPZ2hzv7qlb6c6qFc02ltytyTaabRJTqzLMZYvnICW cl9LA7vH14vijZ4I7SF2V2/b/WEnqRfvs8Jx2yhBUnO01r7xq8LeVo3aJR5HS052lt93Cg YQT2pd3BDPGFnpSAP5LTLqyweeKvh26DazZ30d/z5gq+UfYPPKfxRXB40gvemw== 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 4bsn5Z70Bfzc0r; Wed, 30 Jul 2025 22:32:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56UMWIR4051078; Wed, 30 Jul 2025 22:32:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56UMWICL051076; Wed, 30 Jul 2025 22:32:18 GMT (envelope-from git) Date: Wed, 30 Jul 2025 22:32:18 GMT Message-Id: <202507302232.56UMWICL051076@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 3b3a28975820 - main - syslogd: Fix function return test 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3b3a28975820b302a8bb8c69ef96a38d8a7c7aed Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3b3a28975820b302a8bb8c69ef96a38d8a7c7aed commit 3b3a28975820b302a8bb8c69ef96a38d8a7c7aed Author: Nathan Huff AuthorDate: 2025-07-29 21:58:30 +0000 Commit: Ed Maste CommitDate: 2025-07-30 22:32:05 +0000 syslogd: Fix function return test Looks like during the capsicum setup the return value for cap_syslogd is checked twice rather than checking the return value of cap_net after initializing the casper service. Signed-off-by: Nathan Huff Fixes: 897240c7d666 ("syslogd: Enter capability mode") Pull-request: https://github.com/freebsd/freebsd-src/pull/1796 --- usr.sbin/syslogd/syslogd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c index 726cedc17b1d..fe7427130b78 100644 --- a/usr.sbin/syslogd/syslogd.c +++ b/usr.sbin/syslogd/syslogd.c @@ -2571,7 +2571,7 @@ syslogd_cap_enter(void) if (cap_syslogd == NULL) err(1, "Failed to open the syslogd.casper libcasper service"); cap_net = cap_service_open(cap_casper, "system.net"); - if (cap_syslogd == NULL) + if (cap_net == NULL) err(1, "Failed to open the system.net libcasper service"); cap_close(cap_casper); limit = cap_net_limit_init(cap_net,