From nobody Wed Mar 18 09:41:42 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 4fbP3w19vqz6VY1v for ; Wed, 18 Mar 2026 09:41:48 +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 4fbP3v5gx7z3FM2 for ; Wed, 18 Mar 2026 09:41:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773826907; 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=Tx7NcZgZZtzpxAkRBr/3gtcSjWPveTAJkJvH3YhPmsk=; b=PUQd6CAUweXkY4TZHdPuUJwWrmdhmSVWJahMdXxnxplR4b91FT6DA+53T6RWzkgvFtfUWX ZHVY3weniyAahqfaXZkV1KXpFC8UVvNl7IHNfvEU9IXkSTcedrqzK912DuZm5PG5lE8ydI 7B+mzRG+g4Bbhz6Czi+23xKEOiXpHzauDJu5QDExV1083OvrDyjOtxh9Qgv02gRRu6muz5 Or146OGQ67qw8DCZnOX55x5T7BHAF9z3D4YePoWiWOPrm0m5jOPrN3Cu/04JT2TQ1HIg// kRAI3GiFLViIQzb27/c/6FiJ7PR9DrM5UnkKceHF5nFIMofsJAoPgsPfR2BuvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773826907; a=rsa-sha256; cv=none; b=gSKEjQKFMFiABmJiBIHLo68rywhoQDdT7kI4DGNNEb6miBFBKySOHZCxspI+cK+7gE4nDi Wpv3oas1d4CPI0xiEHJ20OOyogP0hBTGG3SvFhSbv376HqeCtxV5hAntCzxKBLBUBFT/lr z4ujguSfX9+wtkaXilISJGXR3VrHrcXI8gDHLbArsG4x1veLYl4S/FzdXhLN70rpoFQSMp MpzRlDqCHNzFJH5nNB7RTbNjpQP196KKs1T7UZMRmBvHzZQmHLiqWkJUo1a/lNhPik/GTu /qOyx4YENA/Y2e2Olic+eATopVnofQWwCaOrEvOatEBe1YtuYMMQm6aZ0K/w1w== 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=1773826907; 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=Tx7NcZgZZtzpxAkRBr/3gtcSjWPveTAJkJvH3YhPmsk=; b=dTt3S//KB/5lDjLHD5QfFGfE1H+obaeNuc8+41rdOfkq1hlgHDg0jghnNDldC3YG7tnvV1 FvwBNlJGRAPDDCdOoZ6V7oohF1Fru8CMQFl/GBxgs0laEewl00uHWtAp2tnwd9jVtbtHxz 6WPyje+ywH1JIP0Rp3fWAVK2soA6TthikBCZvIo6iFfHQ6XWaiLs1dZY3p+Obp/5XLfC0f 1FvZVdUH9fyybYO7zhWVh/3P/Pmvw8PzkfRG6f3WN/+4T+knqCLnUjck4IUDt/xqz8YmY3 MmeHPVuQjkUmfd+f50lIWfIhGROn02h/rTAxLIQ1wfxI3llyHKda0od8UWRcHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fbP3v4xfWz132l for ; Wed, 18 Mar 2026 09:41:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1be4a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Mar 2026 09:41:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Seth Hoffert From: Kristof Provost Subject: git: 9031b83ac133 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 9031b83ac1334094c90e1242b478c8ca4a72bc47 Auto-Submitted: auto-generated Date: Wed, 18 Mar 2026 09:41:42 +0000 Message-Id: <69ba7356.1be4a.ee99a03@gitrepo.freebsd.org> The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9031b83ac1334094c90e1242b478c8ca4a72bc47 commit 9031b83ac1334094c90e1242b478c8ca4a72bc47 Author: Seth Hoffert AuthorDate: 2026-03-03 21:56:45 +0000 Commit: Kristof Provost 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 (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 };