From nobody Wed Aug 26 15:39:19 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 4hVTN74kRMz6qG44 for ; Wed, 26 Aug 2026 15:39: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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hVTN73chwz3XwQ for ; Wed, 26 Aug 2026 15:39:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787758759; 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=VVjmyNSI2+kN2dMF8iU9M6Tp0nT01jnHK2SHYHc4PQY=; b=eKb4hbFeKNABn6RMMstLSpdcTHYYzsnelJLgUBaLqRZQB7ljcO/iFy+jWhCcIXKVUCQ8nj RulzzVbHNGnsji2KS672ZC9XZicT/H7ME9WhsgHgE0PLDhX7JLm/qDi9C1vcs0ZcwHS7qt Vv/YPL/v7krcAt8ZE1jQkF2kVU2GEZNAgs3lcWJQm4BZlgpBleAbCLRWqo4fMgo8QOMBmB lGUqZSoNlKNgOipr55P7xOKBGlx1ME9UbacAlomENX6Ej69zHETHlhIqUFa24T8blu3yyM R9SEPq1ze7nddg2nbhGmJ8QNL/HZgncdN0snVgCqPvHLdxIide28H+pmkqTA5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787758759; a=rsa-sha256; cv=none; b=KSWVkBzAVA7BuX2NtJsTe/yZjgt2J7YstygrDuxWRiw3wrNt+nWm0OHKyfz9Ddt6CTcKAz 81yuVmb+Yh1q3GWxBqGDjhgX6/mwsOHDDWVdOnudgAWupwMmhTMMq85I3N49t8Qj+KFkZy DpQ7vgmR9xz7ctUR83lBPCDzZRSDZcF3i6qnyFttQ6oyp3au/+A+9I6GiUXGQ1Av3NCBGe YzfF2j8wN7RDXOERrpASzxzIFbNMoTk0+WkH5M4AdzXmMWGpcPV4IwKoAB+aL7NhX1HgN2 3CAVljSt5+yOt3u5YLZI3fHEUzNct41qLl8RCfbPOulI4mLiAPRnZFszCRaEgQ== 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=1787758759; 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=VVjmyNSI2+kN2dMF8iU9M6Tp0nT01jnHK2SHYHc4PQY=; b=lLqKNTBkn3uKfDnQyJX8kQpO4698k1eTTE3QvPCuhHXG8iShbLM+MQWkCiNl8bVSJdzkZa mXX8cf6RiWqar3UMXE88yxuZUPZvOLsgQo30ReLDg4OFTmLtDAoklGaj8PY9fwvW0etq/Z 56q2Wi6nRCtsfAYZeG8Bbpiyd8nOEdRdDbTKRfaodSMqCuU90tH/cY//GFrRj4CxdIWo8F tFlsrzE8aufWqxGRF8HYR2g87G73cTOYVejPNdSKIvxTHSi0xo1mTTa/dzDmi3XW0lZtm0 e1dgeYCyyJ1ROqY52zfA3RsaTYwFj7QWRLcso9ic210O4/kgPXMFs2Un8QSOUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hVTN72cv5zkbC for ; Wed, 26 Aug 2026 15:39:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27879 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 26 Aug 2026 15:39:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 5de5140f0695 - main - pfctl: fix printing of wildcard anchors 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: 5de5140f06959f2724c626c7fab3e1c9187beefb Auto-Submitted: auto-generated Date: Wed, 26 Aug 2026 15:39:19 +0000 Message-Id: <6a8f08a7.27879.16e5bde@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=5de5140f06959f2724c626c7fab3e1c9187beefb commit 5de5140f06959f2724c626c7fab3e1c9187beefb Author: Kristof Provost AuthorDate: 2026-08-26 14:52:07 +0000 Commit: Kristof Provost CommitDate: 2026-08-26 15:03:58 +0000 pfctl: fix printing of wildcard anchors PR: 297839 MFC after: 1 week Obtained from: OpenBSD, henning , 5b6657d4d8 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pfctl.c | 10 ++++++---- tests/sys/netpfil/pf/anchor.sh | 30 ++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index c349487ed9d2..b650c2fcba0d 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -3662,6 +3662,7 @@ main(int argc, char *argv[]) int opts = 0; int optimize = PF_OPTIMIZE_BASIC; char anchorname[MAXPATHLEN]; + int anchor_wildcard = 0; char *path; const char *idopt = NULL; @@ -3852,9 +3853,10 @@ main(int argc, char *argv[]) "be modified from the command line"); if (len >= 1 && anchoropt[len - 1] == '*') { - if (len >= 2 && anchoropt[len - 2] == '/') + if (len >= 2 && anchoropt[len - 2] == '/') { anchoropt[len - 2] = '\0'; - else + anchor_wildcard = 1; + } else anchoropt[len - 1] = '\0'; opts |= PF_OPT_RECURSE; } @@ -3911,12 +3913,12 @@ main(int argc, char *argv[]) case SHOWOPT_RULES: pfctl_load_fingerprints(dev, opts); pfctl_show_rules(dev, path, opts, PFCTL_SHOW_RULES, anchorname, - 0, 0); + 0, anchor_wildcard); break; case SHOWOPT_LABELS: pfctl_load_fingerprints(dev, opts); pfctl_show_rules(dev, path, opts, PFCTL_SHOW_LABELS, anchorname, - 0, 0); + 0, anchor_wildcard); break; case SHOWOPT_NAT: pfctl_load_fingerprints(dev, opts); diff --git a/tests/sys/netpfil/pf/anchor.sh b/tests/sys/netpfil/pf/anchor.sh index df4a1660d797..a1935e126ed3 100644 --- a/tests/sys/netpfil/pf/anchor.sh +++ b/tests/sys/netpfil/pf/anchor.sh @@ -550,6 +550,35 @@ recursive_flush_cleanup() pft_cleanup } +atf_test_case "show_recursive" "cleanup" +show_recursive_head() +{ + atf_set descr 'Test showing anchors recursively. PR 297839' + atf_set require.user root +} + +show_recursive_body() +{ + pft_init + + vnet_mkjail alcatraz + + pft_set_rules alcatraz \ + "pass in no state" \ + "pass out no state" \ + "anchor \"test/*\"" + + echo 'pass in' | jexec alcatraz pfctl -a test/testing -f - + + atf_check -o match:"pass in" \ + jexec alcatraz pfctl -a 'test/*' -sr +} + +show_recursive_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "pr183198" @@ -565,4 +594,5 @@ atf_init_test_cases() atf_add_test_case "include" atf_add_test_case "quick" atf_add_test_case "recursive_flush" + atf_add_test_case "show_recursive" }