git: aafa123641be - main - pfctl: resolve '-s' ambiguity

The branch main has been updated by kp:

URL: https://cgit.FreeBSD.org/src/commit/?id=aafa123641bed1f04546f7340d60858af082df94

commit aafa123641bed1f04546f7340d60858af082df94
Author:     Kristof Provost <kp@FreeBSD.org>
AuthorDate: 2026-01-05 13:27:35 +0000
Commit:     Kristof Provost <kp@FreeBSD.org>
CommitDate: 2026-01-14 06:44:39 +0000

    pfctl: resolve '-s' ambiguity
    
    The 'introduce source and state limiters' commit added source and state
    limiters, and used Stlimiters and Srclimiters as show options. However,
    FreeBSD had 'Sources' as a show option already. This means that
    'pfctl -sS' would now be ambiguous. Avoid this by renaming the new
    options.
    
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 sbin/pfctl/pfctl.8 | 4 ++--
 sbin/pfctl/pfctl.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sbin/pfctl/pfctl.8 b/sbin/pfctl/pfctl.8
index d3c8b1273b79..45cfd88ef039 100644
--- a/sbin/pfctl/pfctl.8
+++ b/sbin/pfctl/pfctl.8
@@ -524,7 +524,7 @@ When used together with
 interface statistics are also shown.
 .Fl i
 can be used to select an interface or a group of interfaces.
-.It Cm Stlimiter
+.It Cm LimiterStates
 Show information about state limiters.
 If
 .Fl R Ar id
@@ -532,7 +532,7 @@ is specified as well,
 only the state limiter identified by
 .Ar id
 is shown.
-.It Cm Srclimiter
+.It Cm LimiterSrcs
 Show information about source limiters.
 If
 .Fl R Ar id
diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c
index 256868a399d2..fb08d6300f23 100644
--- a/sbin/pfctl/pfctl.c
+++ b/sbin/pfctl/pfctl.c
@@ -320,8 +320,8 @@ static const struct pfctl_opt_id showopt_list[] = {
 	{ "Tables",		SHOWOPT_TABLES },
 	{ "osfp",		SHOWOPT_OSFP },
 	{ "Running",		SHOWOPT_RUNNING },
-	{ "Stlimiters",		SHOWOPT_STATELIMS },
-	{ "Srclimiters",	SHOWOPT_SOURCELIMS },
+	{ "LimiterStates",	SHOWOPT_STATELIMS },
+	{ "LimiterSrcs",	SHOWOPT_SOURCELIMS },
 	{ "creatorids",		SHOWOPT_CREATORIDS },
 	{ "all",		SHOWOPT_ALL },