From nobody Thu Mar 26 01:11:23 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 4fh5MJ3gmJz6X3h8 for ; Thu, 26 Mar 2026 01:11:24 +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 4fh5MJ0TNkz3FM4 for ; Thu, 26 Mar 2026 01:11:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774487484; 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=VuQeJ/0oHYNPQDM858PbVVCwuLIToasbFpjRkfTJdZ0=; b=aVuWx9uDtGDEBw2Kv8aLd2X0TDyIU+QMJKxMfrUZOdMV44R7Wuyt2aBcXikIWX/qu9UVvu GQ9nBjSDwLsVFFU9W3FqJZaB0KHj5crJs5bjuOMeiEBgxv4g4CBzw4tJIR4wz7Fv7flhc/ UiCtT6F51HwX434dUXRElOxe8OSJGiwo5HdRGaaxgoRkdap5a3Zy+GwhBabkfCSR7UbEF6 ymA0WS4bOB04dZLCZFKp7poFNrN9e3kZ8bHsebOfKqQKSbbul0DTzzANfW0AXTvcFAXQOj 27miFh6TsnmtIsrmFA3s8bbOzIicLMQni0Db2tcG/g39ZxYOnzVC2WisxJ3+Wg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774487484; a=rsa-sha256; cv=none; b=YGcIBTStNNFvjl5bWx4KZBgiwm0q8YC7ZLTX7OUUWMBGd1ri56AnFmpe0Yp7KIgEi9IaId 7+SfBaVISunsFktwyhvQEqWfUMV3guu95kFLsi4te4ljAYFIBP/EyCr/KmF8284mnThsZe 5ba4Bw9L8Uf5TzjQyb0MiYBTTx08A0FyfFfOSgpXvZU5OhdiP7somsbLdjowLLgLdD6ecn vXkESpM0GXIyTrJaA8/4UeNHWqHKni+nd3ekdZqdSYYE8861O0T/Cqw8R+Cx+PUkP0pfD2 SbaLIyp8lmydFhEp+NWBVmErIU3Obe7Oldn24FbA1Kjgmn0FUhWb7W5F5RO1Uw== 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=1774487484; 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=VuQeJ/0oHYNPQDM858PbVVCwuLIToasbFpjRkfTJdZ0=; b=OSYjF37i8xnedYOc8PCAXw2ochfF/s1MaYTcaxW+nX3Mh4UsrmNtRI+tnTcFH5LUWPYO0P S+SOfiRo3Jy6cu77KcGJadhpOkEyPQzh7G1L/M9xO2igpMbOZsITc7Jbfm+HZ95hR2ccNb 2gQpwRNsRTZ6qeKQwXwgMyGRjAt766hTCgd1uxRh9GKY9keGd5Y5os5MBmCyPR7l6cErNk xOxjMvH7iJKbC+MIf88xYMV+7jC7W3Z1+dlJTUoJ0KF8qZ9zfQ4bP+Pe/7qk4dlmIQHNW6 lXytQ3h+qquY/+5U06cvvRFEcthZPrgyyOFX8lp7ULy/gOn7fSqtj1sMi4Dp9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fh5MH6xTkzVLS for ; Thu, 26 Mar 2026 01:11:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19301 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Mar 2026 01:11:23 +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: d9f9b4268f28 - releng/15.0 - 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/15.0 X-Git-Reftype: branch X-Git-Commit: d9f9b4268f28c5d47fc3726f525a5715eefabc76 Auto-Submitted: auto-generated Date: Thu, 26 Mar 2026 01:11:23 +0000 Message-Id: <69c487bb.19301.19d17f23@gitrepo.freebsd.org> The branch releng/15.0 has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=d9f9b4268f28c5d47fc3726f525a5715eefabc76 commit d9f9b4268f28c5d47fc3726f525a5715eefabc76 Author: Kristof Provost AuthorDate: 2026-03-12 14:24:42 +0000 Commit: Philip Paeps CommitDate: 2026-03-25 16:06:21 +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 e224b9b867f4e7de959afaa63d56672e13d7c454) --- 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 36bdd9705830..a8a393cf2949 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -2189,13 +2189,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->rdr);