From nobody Wed Mar 4 16:21:12 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 4fQybK5rHGz6Tj1Q for ; Wed, 04 Mar 2026 16:21:17 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fQybK4jxRz3rJC for ; Wed, 04 Mar 2026 16:21:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772641277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AUqJAIRpTWVFLY9gorqqjh8Nvf8bD/tl6Oc36g3qKB8=; b=pzJb2VT5SklTHy8e8phcW786BlYbE09jQyMGj5SB1pyEhWwnK8GxJJOdiYx3f6cCG1xyFb deCgAxPLfnpOnveCXgaMc6PurBRz/Xgy6tOqPpEWiRgesfK8sw980H+buEaE97Ja8LKTZ9 Mp/MlRax92bBY6kARasnJDMJ6KOlquFkd0EWUmqOzAp0eGgw7IU6qrATdqN0XcXGAVefEn Z1+labcTRZeYnNgribl4iF3fP3QhvumiJ6a+YB8LZZKoBy5RqeQuLzIeM9zWaj37G5emwF c25wUtomZseblJo5298zGlGzvdP+hBt8+qgh/iX1mH9DkbaQUm/WVW2vXr5l6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772641277; a=rsa-sha256; cv=none; b=t8c/G9R/DbOSK89eAZUqg6SaIX1jMKyvp29U3h6parsIkuzj4iOejFSCFJOM+Ji9Tg/qz4 noTkytY3AnG08t86bhy7Dc9mUZNAhI/njZ0+aq4SYOT2yoAbtAip/gSe2lU959Ixj91Sc1 kXADbSkTCoaXa1ZUePEvV0B2b7bS408jQt18TqOXiqr72uF3dxN6QkjDAbgwK12J9qcSqH SCsTVEaMMoyyhc5BKtL5k7z92tuHm49cPzMLYQaleKH1IFQWePh9j+JBil/4kavqheOV7W ksJucKdOFfmTRW5wHgILIbfaBxhmX3v9lxjYK0oER8oQLqD3kxd/9IMqRLLjkg== 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=1772641277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AUqJAIRpTWVFLY9gorqqjh8Nvf8bD/tl6Oc36g3qKB8=; b=Xb4BK2Wwa+P59X2VHSoXGyw1aarcK7QljYlV1c8aKM215s5hwF0rbsGB+tz6tgpJLyXP4V HWE5XhMmDFXShwyqnTX0gGDIGIVh2tcm5xISku/DJw8ZODW+rRQcFM/J9UeC/kcDq7p5fF rNe95qWv8a7zDtS4rerzPoZFlVOOsQlLmwUnglivG8c/4r2PahS+Pn/X8wDVHxQONxgt+q f8gZJqK6qT97c1vFXHwrEluAxlgRi6I8op+4Xp7pPxa7rH70rO4TMdLMZkvolFNcKUd8rY PBRQo3G7PHnzviItPdg7cyfcl9L786ut5LAx266CgjfiicIgOGHdMlO8x2yqbw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fQybK4BQNzyCL for ; Wed, 04 Mar 2026 16:21:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 387c0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 04 Mar 2026 16:21:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Seth Hoffert From: Kristof Provost Subject: git: 36acf1bd32ed - main - pfctl: consistency 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 36acf1bd32ed5749af4a9f735aeea1a3434fe42f Auto-Submitted: auto-generated Date: Wed, 04 Mar 2026 16:21:12 +0000 Message-Id: <69a85bf8.387c0.2f397e61@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=36acf1bd32ed5749af4a9f735aeea1a3434fe42f commit 36acf1bd32ed5749af4a9f735aeea1a3434fe42f Author: Seth Hoffert AuthorDate: 2026-03-03 21:56:45 +0000 Commit: Kristof Provost CommitDate: 2026-03-04 16:20:34 +0000 pfctl: consistency % pfctl -F ethernet Ethernet rules cleared % pfctl -s ethernet pfctl: Unknown show modifier 'ethernet' pfctl accepts 'ethernet' (or any prefix of it) in the -F flag but accepts only 'ether' (or any prefix of it) in the -s flag, which seems inconsistent. This change brings the two to parity while remaining backwards compatible. Reviewed by: kp MFC after: 2 weeks Signed-off-by: Seth Hoffert --- sbin/pfctl/pfctl.8 | 2 +- sbin/pfctl/pfctl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/pfctl/pfctl.8 b/sbin/pfctl/pfctl.8 index 662f5a4b0f16..05a76641ca8d 100644 --- a/sbin/pfctl/pfctl.8 +++ b/sbin/pfctl/pfctl.8 @@ -456,7 +456,7 @@ When used together with .Nm will loop and show updated queue statistics every five seconds, including measured bandwidth and packets per second. -.It Cm ether +.It Cm ethernet Show the currently loaded Ethernet rules. When used together with .Fl v , diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index ee1b2202cc1d..87343f762842 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -305,7 +305,7 @@ struct pfctl_opt_id { }; static const struct pfctl_opt_id showopt_list[] = { - { "ether", SHOWOPT_ETHER }, + { "ethernet", SHOWOPT_ETHER }, { "nat", SHOWOPT_NAT }, { "queue", SHOWOPT_QUEUE }, { "rules", SHOWOPT_RULES },