From nobody Thu Mar 26 01:14:59 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 4fh5RR5hZgz6X4MB for ; Thu, 26 Mar 2026 01:14:59 +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 4fh5RR1yyMz3Jyc for ; Thu, 26 Mar 2026 01:14:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774487699; 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=hrh4fbkmdrRCN+43RTIZBnNXeoQ65H/p9js3Vga8I98=; b=T3siq3al/badKF7KVrolQNDq2bSXPt5CrJHcNSGXn6+KldXVZMEYdN964xsOcCycx6rCIq ztcZWjUp7X26sr+t+klEaGlubMCJijGpXfOUos66kwCwvn6DKlahtzqer335mDv2svgmbx 1oSQAJ3bZNmesGC4bgB9J8dw0jaVqRTHD3ZLqCkOTx+z/zWIeuWruYyu+BXR5S8XHEuEq6 /pEBIjLNSMb6speTZ5qNZlrUZ5lIuQFuGrtr3o0VUGvbFT0vLsnkL0vdqnCxU3LqFFILwc 335p8W+prxFvgeGzbM0DOCNM5LM3Tai9OwOHSetQtLLGAbZ1ZuztQ9WzBwFgyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774487699; a=rsa-sha256; cv=none; b=p6bX6aYgFvjvv8Hj1Ms3A6NMQevkqxHyusGkw+jW7unqC40eJJAYtppAtVANqogJTLMPSo Gooe5QzG672KOhStqPuVxiVK6woFGjjCD/cL/5mKy4vc9HniR/nWr2FjmJ9tB01+HVLjws 5xvOJE+nkO1MeBvPgtgubXwBsylh8c2v1dFfyU/0F+nkSHnnNJfA6BcowuY7oRDhL0w123 Vxy4MnR3dWAPNs3zv5KkU1b3pOMJVi3hrIvKrWNvMHMPCLNjIU4cZvAObZw1V3MspgBdW8 Ys0NklQUcx5q/VQ9JsAk8n9qhE01ZQx6PNVzHFNK3rlGBz/QCCjYRy+/GodA4Q== 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=1774487699; 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=hrh4fbkmdrRCN+43RTIZBnNXeoQ65H/p9js3Vga8I98=; b=bey/blRNb7i79waFXTfMSwlmDJKiWUL8kVUkzLtWOLOdkO27caeo8eCm+4eWJRI5auCF3y FWUdDyAFM0BWTkG6rrqNrras5p52RKlDyyEvSYVZk6Asi+izTgR1TFq5E2H/NUeZ5Qf4gR 0p53/HIP/pksagobY30RfjVFRINdXFe1pOYCC8fN6tqoVurrIcxEMOhQccKNRyZcI4MM1z j6sFMZbUFVbMmuUcLpGPZL1kFWYmIMiZ9TMAls4gaQxaR1eu1KJ9Cn35JCQnMHMtIufpf+ xRRfMgTfcYZiyl1vcDvaU0EBx9iB+Rd23LcVWUemsbfeuWf5Hxm1kJxwoA1ZEA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fh5RR1b2GzVff for ; Thu, 26 Mar 2026 01:14:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18d98 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Mar 2026 01:14:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Kristof Provost From: Philip Paeps Subject: git: a429dbb47ff6 - releng/14.4 - pfctl: always warn if a duplicate rule was detected 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: philip X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.4 X-Git-Reftype: branch X-Git-Commit: a429dbb47ff638934ab5f9768af13165e6ca2dc0 Auto-Submitted: auto-generated Date: Thu, 26 Mar 2026 01:14:59 +0000 Message-Id: <69c48893.18d98.456a5d26@gitrepo.freebsd.org> The branch releng/14.4 has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=a429dbb47ff638934ab5f9768af13165e6ca2dc0 commit a429dbb47ff638934ab5f9768af13165e6ca2dc0 Author: Kristof Provost AuthorDate: 2026-03-12 14:24:42 +0000 Commit: Philip Paeps CommitDate: 2026-03-25 16:11:03 +0000 pfctl: always warn if a duplicate rule was detected Approved by: so Security: FreeBSD-SA:26:09.pf Security: CVE-2026-4748 Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 66d66dd0f6f83926980fc1d68dd366c0057350c5) (cherry picked from commit e79818ec36efafc994d8c5a912dcb94986c038c5) --- sbin/pfctl/pfctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index d6bb0ae7f46f..518b32085565 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -2043,13 +2043,13 @@ pfctl_load_rule(struct pfctl *pf, char *path, struct pfctl_rule *r, int depth) } } - if (pf->opts & PF_OPT_VERBOSE) { + if (pf->opts & PF_OPT_VERBOSE || was_present) { INDENT(depth, !(pf->opts & PF_OPT_VERBOSE2)); print_rule(r, name, pf->opts & PF_OPT_VERBOSE2, pf->opts & PF_OPT_NUMERIC); if (was_present) - printf(" -- rule was already present"); + printf(" -- rule was already present\n"); } path[len] = '\0'; pfctl_clear_pool(&r->rpool);