From nobody Wed Jul 15 13:50:35 2026 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 4h0cy92HFBz6lVy9 for ; Wed, 15 Jul 2026 13:50:41 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h0cy84p1Wz3WZT for ; Wed, 15 Jul 2026 13:50:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784123440; 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=XXfO57Xc08F3tt/rQjbg6qJCKsqittApfTX0qg49FU4=; b=Xwa5UU81iVmSjCSl6VJ7Sh4lIiqadfHrGwI69WdKhnTPJMznjA5ADhEuiJkPikXcLb6LMW D30JNfLxf0llsk3Owu6ZTfkczId+JyY5jCvVP1kkG9o78zrZjVwbpPE8fTGJiIw0EUFAPT RDkxFdH66ja6NmeJQMAv66Y5rfiXvguyxMIyLwd0zQO8ggAjnVNeXop32MPeFE1IdP+wFR dOv7s8VGyktJySFrdN2PkfNFvcGdLuxV34omPKYXnY1zpj8Nb1BGpygY8AVpHbMwBCf5Bt A4FcFhnglPsIvPpaxK6RZ1SDEKvb56YOXiIz8rM2odwFSX0qA4hwv5GwrYjJNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784123440; a=rsa-sha256; cv=none; b=KcY1ccT27b7zKIZGo8Gr8cyY0ygntvzRV990LDrF6hp63JGTttFnziE1FMuXI8oy8cMHdC UjZrWhaygexZ0X1cjAFgbIyzbeuPQXZN+lefAJ9ql4oM4NqCfMXwuHkQRu4hcIWhwuInvI Sp14FMupMoNg0Qhp/BguNU8eXgQZCpPKNqcH/Uc/ryeFUiCLZUGYT+23M/w2TbGuSWLCpz VYF0D8VBWUiBA7I4t6vnKlX3RraTRX8yCo86XWfExtM+z144pZdkUwRMK3iVAUp78x7Tkv wLdwOJdxy9IAvgGK6p4YjgR2jBvYmdAarPLYWB4kayhm9I1N0vMIlMWILBHBZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784123440; 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=XXfO57Xc08F3tt/rQjbg6qJCKsqittApfTX0qg49FU4=; b=NXoT3tSY+yOJpwg1XvsOJMAq7FTY/s3YvSovILOOYintJ/r7DU45IWj0KVwdY3fjzbSCSl 74ZUyID2KYpW00nN+OztMwnf1m3+T7wS/0jAjfyj3U5qxomtswLKlSYoWtAxVnGVv9KUk5 JhcD0cl7SjqybsKu34LAe1qPtBMc3ra4iB3w2hBB7r5Oh+xJa9DarU+GhfYnYaJoZSxLnL Nu7CL469iMtDBVNEZXJlMxusnuMmNSjvyPPmIRr+UMAj3AdTqWz15iBkdvHwsD6yGZ68V1 Yixblgd/tYHQ1kzfQMbGsbiwVsplgopNHuyWirupVXImboI5s5CU3x5fe1BTMQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h0cy83jp3zZlN for ; Wed, 15 Jul 2026 13:50:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3872e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 15 Jul 2026 13:50:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: ddbf89234312 - main - pfctl: fix CREATE_TABLE error handling 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ddbf89234312791e65991efff39a18a9e8e4d077 Auto-Submitted: auto-generated Date: Wed, 15 Jul 2026 13:50:35 +0000 Message-Id: <6a57902b.3872e.534920fc@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=ddbf89234312791e65991efff39a18a9e8e4d077 commit ddbf89234312791e65991efff39a18a9e8e4d077 Author: Kristof Provost AuthorDate: 2026-07-13 13:14:10 +0000 Commit: Kristof Provost CommitDate: 2026-07-15 11:44:59 +0000 pfctl: fix CREATE_TABLE error handling pfr_add_table() does not set errno, it returns an error (now). Read the error code from the return value so we display the correct error message to the user. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pfctl_table.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sbin/pfctl/pfctl_table.c b/sbin/pfctl/pfctl_table.c index aae347712547..aec02c493f1b 100644 --- a/sbin/pfctl/pfctl_table.c +++ b/sbin/pfctl/pfctl_table.c @@ -85,14 +85,15 @@ static const char *istats_text[2][2][2] = { } while (0) #define CREATE_TABLE do { \ + int _ret; \ warn_duplicate_tables(table.pfrt_name, \ table.pfrt_anchor); \ table.pfrt_flags |= PFR_TFLAG_PERSIST; \ if ((!(opts & PF_OPT_NOACTION) || \ (opts & PF_OPT_DUMMYACTION)) && \ - (pfr_add_table(&table, &nadd, flags)) && \ - (errno != EPERM)) { \ - warnx("%s", pf_strerror(errno)); \ + (_ret = pfr_add_table(&table, &nadd, flags)) && \ + (_ret != EPERM)) { \ + warnx("%s", pf_strerror(_ret)); \ goto _error; \ } \ if (nadd) { \