From nobody Wed Mar 25 10:54:01 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 4fgkL13mpXz6W5jM for ; Wed, 25 Mar 2026 10:54:01 +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 4fgkL11wGhz3McY for ; Wed, 25 Mar 2026 10:54:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774436041; 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=rwsoGIgrfnsk+OJelOt/ObUiYMtecABBE9IwFATXrXY=; b=AjaRE4iHl90wlRsD3E4VVUDAs1/UIXBudZAjXyE6winrfENplWnzMomhxiGW6um04Xugwd OzH6k9DSsPEd74aDWpHTz6OySulTHy37XuF11L2W4rNLjqdT7zDxgqETEEJxl0cN+0fGMi pETI9o8ld8Gjqbl9/CbfqC4Vifx4k1gJPLFVYT6qDcsL8yzAqv5QqE639iRu6Ku3cqyebu hWcYfvBjnVdyww5fn+N9TqLa7Bom0sAIHk+lj+blYGwDKXaajPF1JQ4UK3WxyBihWY9ryl pwiEJN53gplRWQ9WBCBLM4RpGolWR2/qD9yq1i++3s4GhZULba+LI4SRzowSew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774436041; a=rsa-sha256; cv=none; b=WSP/QxbgZYZCzgr+mD1BGiG6YlE3KlrJavJgf1tixTMGHMGUOCBK2AQwa+0XNDu0EqReGL YdPCvILb/vyhk1sUKRNHf6Hwzeec3IADAXTf6Pm2M6XMK01R23bh7ej0HOAveDVgUCeeM8 ZPwamftE0VDZ4QU54QtWpRZaBaay78u2BqGxe2ONky3XFRrH8O6oG8eT1qUMb/AP4+lMFc RwMRnFOWsigelkOqI1sWTD+brkUEl//x6JgpHOuguu+9J/8psUSdICiHS6Wxc3EJ26a803 BIuit/9WVscNwneGNgiYWuo9P7atCfR8nEBi1TgRlVTQ2JUJYZuBAKdi5xu71g== 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=1774436041; 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=rwsoGIgrfnsk+OJelOt/ObUiYMtecABBE9IwFATXrXY=; b=w5T9p+XvY/590NY5iO059fNgxRBFLBTFbo7JaraOPip4rhP0b20h8jxqxv7ez/fNXAiWsj MCekCWLVysNkZJpQnSehTWXJwp6lOky0HnjB5m4pALT/6ttyXFUMKP2RDO7FeE6nASmg/h OGX2eDXWyFIM4/wYpDtv/Ve9t+Opvg95DDbNZYNgVfS/fJkEpFKcO6YaFmuyV1eebu1A4D yZNNoF5fmyJFYmKzWht8bLuXn/jMXHRvLGueD0cDdBM2lISv0z8dzjC1kLq8DqFV8wpm2L ZPg1J3+vlPt9FxOdUl457R3hYWOnEsL9XlW0UPJ0TQgahtf12FVDy7eGmcOj2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fgkL11RrNz12K8 for ; Wed, 25 Mar 2026 10:54:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35ccc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 25 Mar 2026 10:54:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: e224b9b867f4 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: e224b9b867f4e7de959afaa63d56672e13d7c454 Auto-Submitted: auto-generated Date: Wed, 25 Mar 2026 10:54:01 +0000 Message-Id: <69c3bec9.35ccc.60c2adc2@gitrepo.freebsd.org> The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=e224b9b867f4e7de959afaa63d56672e13d7c454 commit e224b9b867f4e7de959afaa63d56672e13d7c454 Author: Kristof Provost AuthorDate: 2026-03-12 14:24:42 +0000 Commit: Kristof Provost CommitDate: 2026-03-25 07:11:58 +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 a9839304d0c7..7865467f2ea8 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);