From nobody Thu Mar 26 01:16:05 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 4fh5Sj62Klz6X4Mv for ; Thu, 26 Mar 2026 01:16:05 +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 4fh5Sj1tLRz3LfS for ; Thu, 26 Mar 2026 01:16:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774487765; 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=tTEEjQ5M16rZNVRnIlkP48Jfk7JEl+KRI7av39GqOdk=; b=dVuVM2dOhKbYX8g5Ntiirilcwbej1mU38tYwbDikTcFXlzisYv/orOSV9nZ5QRV4G6V6NO PhLua2Lwu59KWtYfbOoT/J9ZRewVynBk9KtMNp7A0UxbnaMf6PnWKSatPPSL2vCQTY9xAy 1PWZo0+AQaSfFR6FSZtRh9x3D0CY8ITzvojiaXV3JL2RxBu1djxuWbE8TYnaBBN+I1NS/m Csee9EHnFUW1eVPw0tSVaTriGLChNklPVcMVOwAfbN4t7sDMfubXpKUFq8Gjahf2jMwPUY vbSrMQQa61q3tbP8ootKLwNPWy+ADqdEYyjnWe+/C0Zgo121R4XWXQ4tT+HPZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774487765; a=rsa-sha256; cv=none; b=SMmSZnIGknGPCeziY/7BRy7h6vxjgrS/CSyR1spqwO0YfrX8DakbGHyuC0Z+MkJuXqGIdU Vl756mAHjZplXA+Ym02NVk6aR260IzyMYG72S0ankB6SL+cZLhNsGwh76FcGTOKFfaBVfy 5EWudzqknNIQRl6QeCRdVUKUh+BkKzGLqmlSsENbm5YBbPWIxk3iYsyTYMT0Mrh6WQFHo/ j6gRuaBuUu0t1uSTmwvzw9DpsFycJBsdAOqLhye4pmOe4l206IpyTj+nD23jR5e68GDdiL 44/BDMgIOzCfIQAWcS+cOTLXjLaEbwxgmcklcfyNy2vTn9XLVRCxKW2q4YWWRQ== 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=1774487765; 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=tTEEjQ5M16rZNVRnIlkP48Jfk7JEl+KRI7av39GqOdk=; b=b7yvzZqu4RQ09vtbpy+uox32r3xp6qgF6WNIco7zCet7s1aQpCTDsy51TyLpbWEiVF5s7T GXiOzRXNHSTgYM+BY1SUSf7KH3hy/txnUqdTQ2UPYMNgpHisOIo64aTKY/8F4tKCpzFt8j QMkclpMv+KUrtctGek6imgdqthFznkBBm2PpSUdC6pwE/mgDEIB9VeE/BqXkBHmRxeBgYk UUdsU8EDU0yEXBz9W+CAOU2598LgRqtUdHksSJVqiBazVxmv1XGcpFBnrS2tCG6ndEBibo AOblUx9A5mis9ra2C99UWQrj0Dh4hfKQxQWgKjOXafvIQm6/VE2xKXoFhR0i9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fh5Sj1RF1zTvd for ; Thu, 26 Mar 2026 01:16:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18da1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Mar 2026 01:16:05 +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: 926ee630b73d - releng/14.3 - 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.3 X-Git-Reftype: branch X-Git-Commit: 926ee630b73d5bf0264bf69284ef4a407b2462d4 Auto-Submitted: auto-generated Date: Thu, 26 Mar 2026 01:16:05 +0000 Message-Id: <69c488d5.18da1.61dec6fe@gitrepo.freebsd.org> The branch releng/14.3 has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=926ee630b73d5bf0264bf69284ef4a407b2462d4 commit 926ee630b73d5bf0264bf69284ef4a407b2462d4 Author: Kristof Provost AuthorDate: 2026-03-12 14:24:42 +0000 Commit: Philip Paeps CommitDate: 2026-03-25 16:13:37 +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);