Date: Wed, 18 Mar 2026 09:41:42 +0000 From: Kristof Provost <kp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Seth Hoffert <seth.hoffert@gmail.com> Subject: git: 9031b83ac133 - stable/15 - pfctl: consistency Message-ID: <69ba7356.1be4a.ee99a03@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9031b83ac1334094c90e1242b478c8ca4a72bc47 commit 9031b83ac1334094c90e1242b478c8ca4a72bc47 Author: Seth Hoffert <seth.hoffert@gmail.com> AuthorDate: 2026-03-03 21:56:45 +0000 Commit: Kristof Provost <kp@FreeBSD.org> CommitDate: 2026-03-18 01:41:58 +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 <seth.hoffert@gmail.com> (cherry picked from commit 36acf1bd32ed5749af4a9f735aeea1a3434fe42f) --- 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 5a74a8fd3444..b65ee5adb1b2 100644 --- a/sbin/pfctl/pfctl.8 +++ b/sbin/pfctl/pfctl.8 @@ -450,7 +450,7 @@ When used together with .Nm will loop and show updated queue statistics every five seconds, including measured bandwidth and packets per second. -.It Fl s Cm ether +.It Fl s 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 19a20ce0ec3a..a9839304d0c7 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -252,7 +252,7 @@ static const char * const clearopt_list[] = { }; static const char * const showopt_list[] = { - "ether", "nat", "queue", "rules", "Anchors", "Sources", "states", + "ethernet", "nat", "queue", "rules", "Anchors", "Sources", "states", "info", "Interfaces", "labels", "timeouts", "memory", "Tables", "osfp", "Running", "all", "creatorids", NULL };home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69ba7356.1be4a.ee99a03>