From nobody Tue Mar 24 06:03:57 2026 X-Original-To: dev-commits-src-main@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 4ffzxn4TvGz6WB40 for ; Tue, 24 Mar 2026 06:03:57 +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 4ffzxn2Kxxz3Sv2 for ; Tue, 24 Mar 2026 06:03:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774332237; 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=hy2c+evir0z/QTsFCPke+T6pmo/MFfep8nV4FvIPfIQ=; b=CDaO983FTsq1LV/E/uI8oKooBqED19k3mJ2azQzq8tUNmODJx7il0LIpv/HArrnC5rpepj +mM8vPwmNyoC2vJNsnS1O8dAdRZj6yTYHJqrJB80mC1lz/vy1xeJjRzQPUVn2VLlZWJfMC tnpaDk7M/+yeWpHDUkeLKE1d4QmTd9+FDVcPnebzJ6X+6L/NX/qKWwXE1Dv+pQ8aOj/n1N mK6EWz3w6bxn2xBwqHqqqyBHmYR+spTHqodgbTbvMEBvFpaRUpFU4XKJUlVxejgczYEndv bi4WDuHpA+BXzQlu/JYRY8zfN1zkPQuf4Ig+LWt1WfX3WHCJdAudNXLyesR+4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774332237; a=rsa-sha256; cv=none; b=XnD2Vqzo9cuqjaw8JNBu34fERpZZHF+agNCDSmWEj+A6sa+xLdrKHqRRQFawF0vPxC8Xgj BDnkmeCXMGIKlSPCT7E+uziYqvXUsnYioSowopc4HVFQaUTbj96VIGyTPU1iw7KhbUIZCA ZC/qx7uPDewNHYnosXM5KL4AxwSZ02P5qjoOWLtzaCIOVb4kr+u318SVjsnJVQ9A7A41Dg R4TGSqI2U+A3YDZRhDOktSTiRyHxlcW61Fc89MOD5DcpKRrsGDZsm7lwCsOx2r4cALMQpE 9jFsyXP3k8kx2G91KM+9rmTDtZbXnb4n6Pf9AgzX4Il2U6eaVBb7f3Jd+O0CCQ== 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=1774332237; 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=hy2c+evir0z/QTsFCPke+T6pmo/MFfep8nV4FvIPfIQ=; b=gtV4Gj8qdhlxqNXXlEeSNJMIEgkzpEclGmkGYqBwVrioDonmtc7J3QQIAUJ1i3rZWrVu6P F9kODCxYTec7mLAw1Qi+zpTlrPfMyvtDWXBPyETKG3AGmW1+XirbZPOPB4qS0XSkIUwcc1 +LawMirgoIZVpUNLjJFnij1miKjKeh+an2yl21i8EyioV6SP/p6UP4y5xzSC90xJLdh1ba FUTNM1r5wwobrvqZNyIUNJKDqHMlgmpbt2TqcKC6E43qoV2wgOKZ9KP9lSDltm/FIj9G6B w+rvUIP289El7ekU+ccuYgZzURNWZkH6o+pOFF4A/noGMgqVr1p0Mtrq9DxNsA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ffzxn1fZSz1L3p for ; Tue, 24 Mar 2026 06:03:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e058 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Mar 2026 06:03:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 66d66dd0f6f8 - main - pfctl: always warn if a duplicate rule was detected List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 66d66dd0f6f83926980fc1d68dd366c0057350c5 Auto-Submitted: auto-generated Date: Tue, 24 Mar 2026 06:03:57 +0000 Message-Id: <69c2294d.3e058.4f1c6b50@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=66d66dd0f6f83926980fc1d68dd366c0057350c5 commit 66d66dd0f6f83926980fc1d68dd366c0057350c5 Author: Kristof Provost AuthorDate: 2026-03-12 14:24:42 +0000 Commit: Kristof Provost CommitDate: 2026-03-24 04:27:20 +0000 pfctl: always warn if a duplicate rule was detected MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") --- 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 5a4668416b5b..a7bba4055b06 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -2615,13 +2615,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);