From nobody Wed Jul 15 13:50:35 2026 X-Original-To: dev-commits-src-main@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 4h0cy36mHTz6lVy6 for ; Wed, 15 Jul 2026 13:50:35 +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 4h0cy34x9Fz3WbL for ; Wed, 15 Jul 2026 13:50:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784123435; 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=hIZxI66hjX4r/cCvkOOJWqQoRACKPRz6Ti2OLm4xtSX7rGs9sx+alym1YmdZG7ohv1gE1A 71q3W6jYlWAWSbBoSJpU1TtT0Vey6QvWO/ygAl5muoIjwcJyNDEr2WRR8fgO2l2N0Ky8Fk 50nbl2ibIwF6KaTeVNHizt6vU1pFGR+2Kw72XQhSib8d8QPXU4DJIzVy8y54f/uBS9c5Dp RNgSbNO8uHBQ91J1D3BxT9AetnhxBs4MXyhLcJPUiOkg5tAIt15Woa/kcfLfI1NKrc4CDE ojn9gld87aMumJ09muxyRocXbgbfsWRJLrsctmnOANm8BzHQTQROPX0armjq7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784123435; a=rsa-sha256; cv=none; b=eCZ88BYNBnM4hY2nUpNL8KtJ5uVJ5cFfPhb8Q+Fw0pJIFnASmyZLLtflcQRrE4iw7bS+uw Ma5lgsNaN13fy+4ZcxYBS9bx7SR6/ajCTs2vjyWUW+uxVDqnkFSSXD+apqkRhFeQcCDh0N sPjtXLHRUx4o0oxAC3OLbzs/PXnsm51RlvykEZIIVcYOLis2WoGcOmGOBgBoCUiB+HaxLu VaqycXOfFXTycuv/WrEhByhfrWD+MNuiTknB+Ck7quvoj6IjPku9GDPFfAJix73yV5IFbS xBIN3Y7kohSr7D/x8N1c1jR1axp1e9sd3sVq75Qjyr1P1QJuiiXK5n6TudKHHQ== 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=1784123435; 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=Lpg7gKGrMB9J/rJwGeeyhwOR5tK1SH6XjKEpG/usWH6PQjOfG89RztPthuUVOARw2q8MOW F5p9k81maqO8g/8eXWmS/RNjTbv+ZEK0ZltKd+//pvkp9F9Ejix5SLDn8fdYGBL3SZRFCy +nQRofowK1zRiIiNS7fmvn5rWXSIFWG1IofzDcNVvQtYyhPxFzOjMeZRhsDa1bgGC5UbbZ w3QJ8XJoVZw4D89oxjtKEajMVlBSOg3wBh/cBDTHbfy6lQCxVoeXQye2UgqfOsgfauCWhy jF4zm1yazdyHetQRynpvQq+hBlpf1zRVcTDU3R9XoxfTocDG2JLiAF1+4YkPVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h0cy33PqXzZfY for ; Wed, 15 Jul 2026 13:50:35 +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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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) { \