Iei7jn94DdXCxlJRyhATNyVhattvqGX9IhG48zEPpz aUkNbRUqbkbVIoJ3lBkNxYuYPlIGNEtDhuA3aRvSnS7b3bZHYd0K7ZCjLf0YYQ== 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=1776695057; 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=hNqkDUwHqAnzqXaZLAPMgM7gf/fZrWdEIsn4WCRhpBQ=; b=VS0+EZpcUBWwEFNhOHSMJxoKErfZbhavGqw3GNlGNtNrCPc0dh4cQ82iif9wKf+gPNmn7f kzAJXLD0nSlOwF91UD66CsZtlMGGpoYqfOH5Be+ncVf0zalawJr0X6GSqweHI8E5iT3CnL Zs+WcTmAwm/Lpt7dztg9e66oD1iAkWCqahHOz2T2X35Hz3Q92X/xkS4k4AdzpiAlCG4kqP 0i8NCa91yhe6uWaC+0cpWfeVBo2+AWlTwARXd1lnSc9or0DO5wC/UxzxpJ1x961B3ggQfP gq7pQmMoaN7rCAMZyY9mpcSyiSyGPO7y1yQtUYGJoLpxIdwXdx6/yrsqH+YZ+w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fznmd0Symz116w for ; Mon, 20 Apr 2026 14:24:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22f7a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 20 Apr 2026 14:24:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Ross Williams From: Kristof Provost Subject: git: 18de44e7b442 - main - pfctl: fix man page and error message for -S option 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: 18de44e7b44209d94999523a93d83031e26a5719 Auto-Submitted: auto-generated Date: Mon, 20 Apr 2026 14:24:16 +0000 Message-Id: <69e63710.22f7a.45eb0da8@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=18de44e7b44209d94999523a93d83031e26a5719 commit 18de44e7b44209d94999523a93d83031e26a5719 Author: Ross Williams AuthorDate: 2026-04-17 15:20:18 +0000 Commit: Kristof Provost CommitDate: 2026-04-20 12:50:40 +0000 pfctl: fix man page and error message for -S option The `pfctl -S` flag was added to disable DNS resolution in but documentation and error messages refer to a `pfctl -N` flag for the same purpose. The `pfctl -N` flag performs an unrelated function, so the docs and error messages need to be changed. Caught this when revising documentation for the `-N` flag. Reviewed by: kp Signed-off-by: Ross Williams --- sbin/pfctl/pfctl.8 | 4 ++-- sbin/pfctl/pfctl.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sbin/pfctl/pfctl.8 b/sbin/pfctl/pfctl.8 index 53f2c369108f..1e9ad5cc29bf 100644 --- a/sbin/pfctl/pfctl.8 +++ b/sbin/pfctl/pfctl.8 @@ -24,7 +24,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd December 30, 2025 +.Dd April 20, 2026 .Dt PFCTL 8 .Os .Sh NAME @@ -458,7 +458,7 @@ and flags to load multiple rule types without (re)loading all rules. .It Fl r Perform reverse DNS lookups on states and tables when displaying them. -.Fl N +.Fl S and .Fl r are mutually exclusive. diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index 48e6a053a842..e84e7f9272d4 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -3809,7 +3809,7 @@ main(int argc, char *argv[]) } if ((opts & PF_OPT_NODNS) && (opts & PF_OPT_USEDNS)) - errx(1, "-N and -r are mutually exclusive"); + errx(1, "-S and -r are mutually exclusive"); if ((tblcmdopt == NULL) ^ (tableopt == NULL) && (tblcmdopt == NULL || *tblcmdopt != 'l'))