From nobody Wed Mar 25 10:54:03 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 4fgkL33R1kz6W5Wg for ; Wed, 25 Mar 2026 10:54:03 +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 4fgkL30nvDz3MMX for ; Wed, 25 Mar 2026 10:54:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774436043; 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=jP4xn8Y+3ZnNtCAfIE9askedYJRHhoPGMUExHWvjgmM=; b=nQVYx+NdPhiQC8E7pWZnJy5rZQtjUvg/CNtnap1v/H4Z5V1Czqh/L4vUr19oVBMGfXk8a+ ppiU3Nds53pjTDtp6s+9dbbFzNEuLj/Twhn5/Pz8D+WPnoGeiZTcDoRPdP6gOyfExq5qrz /sOVggvirR0S09Y9zi6NxcaLZCP3CKr61bC5xY/6dNxfYWObI+bSeK9ry253tVR1UgbjUF Zuo40pGdvhEMPHBrM1sOnHQ8DVR6iol5/tqhaCc8VEmPHtORPf3Hw4COp7H9+suX1aPVBr QufBgz1RvUV6+/Xn1Z1fFyg6BhQs83luGeNpJGklEQWU5jUMw2ccyerH3NI1Rw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774436043; a=rsa-sha256; cv=none; b=V0krq0XdpY8eJAzyynyPARUHd+lGFYjdJ176GlNMccTl00d5v0QD9Ma2GsWd11u0fMeDoe juPqK5rurHLF7hamxZoWmQWuvhujRNW3Nc1mpIaOc6Ey0s33j5NI22+UNlyYMWmklCiXoi 0s0KB7XXuZCBo8UumEqG3PtCMSxCx+BJd8tWP20A0l/VKRZzd2bFAcj4rXMsI7Mw8Mm6R0 BQEnXXcU7MUbGosH7DoKuNIgsOjITF85DeB194nklZUWxBA3zGVJkbXjUaecNI5lX2zSq8 4IKnifFeA+xPhFapMpJKiUQpbXDGipY6EqJohePt6B/Pt6GgHGnfGTcsW91b9g== 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=1774436043; 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=jP4xn8Y+3ZnNtCAfIE9askedYJRHhoPGMUExHWvjgmM=; b=vJG2qW3f4OepcTgYaQqwFurOGYEPyamdPPL+Y5NHRTRyskTo0J0BoFTml5x58OC0r4Dtd5 FQctHOJOQerjCwKG+E+bM9GfiShdDe//38Pu+3s5mGV80j23SCigs1ToAKM+s23V8hz40C fB+DBn0In+U7zkyqEo5HDU5LnI9qo8e7CeBscmGcK/MR651rhxKaqLDSqfi7JedgWJYl5t s1+6Gmk2l04hEOIo7Xrexx0GABG01NvZg2ah6DchGiYi/Hp+skU0YcqY4XTrUvNgg67s7L E9E0pgyFBbpT+FSdMb2DRxQCxQXb1QnWlgjEGnSBmCHLOLGQEe62DVYMrWRfpA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fgkL30GQ3z12hW for ; Wed, 25 Mar 2026 10:54:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36e87 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 25 Mar 2026 10:54:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: e79818ec36ef - stable/14 - 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e79818ec36efafc994d8c5a912dcb94986c038c5 Auto-Submitted: auto-generated Date: Wed, 25 Mar 2026 10:54:03 +0000 Message-Id: <69c3becb.36e87.5e3ce40b@gitrepo.freebsd.org> The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=e79818ec36efafc994d8c5a912dcb94986c038c5 commit e79818ec36efafc994d8c5a912dcb94986c038c5 Author: Kristof Provost AuthorDate: 2026-03-12 14:24:42 +0000 Commit: Kristof Provost CommitDate: 2026-03-25 09:58:28 +0000 pfctl: always warn if a duplicate rule was detected MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 66d66dd0f6f83926980fc1d68dd366c0057350c5) --- 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);