From nobody Wed Jan 14 08:06:00 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 4drdwT1ZC7z6PKpk for ; Wed, 14 Jan 2026 08:06:01 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4drdwS5Ppmz3KGY for ; Wed, 14 Jan 2026 08:06:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768377960; 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=IO8ohlribQfNtp2hQf81H95hoc4zSsKKgQS7H4f0r2g=; b=eF3RwGJ25jpgzBbkGX8J1YbL2PI6m/JK7yZVbkFRQg1z2p8dwoYMYV/isR3dx4RrG6DjOS 9vM0VyZkH0+5jW4AmHwmLMFCRgHy1ytIb3IxtZaTxALYuuyzUyPBubOjuByRGMOgeWuFer /dt0zuzNwzsPqJj9N+LmAQ9i32YiF5rJ52/6734dkG0NN588XD/8Gzr7kLMbk66GCpJ10U Rf9Cdlu1fNBeFaOZmGb8fxO68QuTc2Jr8it+//OM48o1PmlGi7/WLTvWDJLDoTyqeDRkmm OQK4YVbvwPR6Ou6CfNjNG8fb0HzEdKO+5tIqZiDIlA1xPXZwyWW0gX1GRlpSPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768377960; 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=IO8ohlribQfNtp2hQf81H95hoc4zSsKKgQS7H4f0r2g=; b=RYF/C4WiKgyRd5aZoqx56yOb7jSCNSwWbjZqq+/Ig07d3atwJSJ8V1yvtk3qHyg45OtDqr pIX1t8MpQMKWh8lDjXF3SUlltZvgnZ9reHh08gkYweesw9PtJ1NJ9o+pStdIagkPdjgAg3 u0Tiqa9B/DZ8f2yxPPzsp2MJl8C4ALpgM8i3xu6qG+mxnHVyMZ4BPgcK3fDgoQcH9ogH88 74bxQ/ZDm36UGafh2mssJC8lTIbxYoZ0CzvW1s2wv8My7h6+y94lihAtYmnGwozsXO6x6L b8jSVd6eyNf6JihOtms8ojHKhArAHol8EkDnsDkCxaSLaH36au2sSa2SGlTeQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768377960; a=rsa-sha256; cv=none; b=Ig4AIgtLvc+wExF1qZlitBXZRdbB5PU+PKlHX67oUTnqB6QgjVu6l65dchmlstxr/xqzOR 9ewomi4giiyKr9ICSu9is9iExIq0C6D1aAjRTXYEfELKg2NnzRyKI2/SAQSwkuSdxUjIdk zZ5q8Qxw41lGByPRa3fYmvD9G3wP/nzFESXPJlBh3yGwTUm/kxwsr58hckC9CwFWs2paPo dUu8FkDYbWWNk8CEZ7oQ6nxw7dGOhJbMB+XHPd3SQQ5CTovtCwUvDMuFfq+rCciz4OAIbA M8W3Jg3ruptXwZv44Bb91tOjnLaahlOAGPm4TQnGESySYAA969hl1KSV+UJrEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4drdwS4rB8zqbN for ; Wed, 14 Jan 2026 08:06:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id a7df by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 14 Jan 2026 08:06:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: aafa123641be - main - pfctl: resolve '-s' ambiguity 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: aafa123641bed1f04546f7340d60858af082df94 Auto-Submitted: auto-generated Date: Wed, 14 Jan 2026 08:06:00 +0000 Message-Id: <69674e68.a7df.44dea760@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=aafa123641bed1f04546f7340d60858af082df94 commit aafa123641bed1f04546f7340d60858af082df94 Author: Kristof Provost AuthorDate: 2026-01-05 13:27:35 +0000 Commit: Kristof Provost 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 },