From nobody Tue Jul 15 13:06:59 2025 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 4bhKGC3B8Tz62NbJ; Tue, 15 Jul 2025 13:06:59 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bhKGC2fwYz3cxY; Tue, 15 Jul 2025 13:06:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752584819; 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=VqB88GdUaRY+4LFlt6Hd+trnV+Ed/yOkFvcLAMct3p4=; b=RGa4/zCv+8Ls+XypJPag0vaQ9aK6twvtrO6SpE6NuYaZSQ9+blZkaX1vU4W4cCRW4A6QnN ess4KspVEozf5STu1pz2rnloMSqqQX+u5SkA5dKsZwc3KYMrVvvA62ldYxEtQyTmJPR1lh tg2n8VMf5nEl896wkZnyLc5HfNkpjZUfvpZ/dEsLhtNwNSvrNlyPEpO93Sn8m/UyWCcQX0 UBA+8ohSZAY04FmL9jvAB9OzH/0x4YwOjepAuoyUi4r/KdYSOCAbJkbzKOYqkdI6RdtCet Mv0H8eAS6svKh5+GNErktJ7WyoJMDeTYbSbi+Hyk2HbZVIJspe/8HFcWwwDVHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752584819; 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=VqB88GdUaRY+4LFlt6Hd+trnV+Ed/yOkFvcLAMct3p4=; b=Aqb6yYwhx7ruWB1cOaS1vLH9353K5QSm/6F4t2MrQ5D+DF2+a08RUvwmhla/f7Q2qM1n41 3XXYeGF1iwhQnETo99oTnKdOuEqeNWwC3OpjZgNZ75iXqepwYHyThZbnnIkENtJlaVX9PA nqRPVaYViEyDr//cFGr7cmQUgh3NuM3u2mtnVJXcvTOZ/nO2jfjrcwm5YHL/IadJ8TOj7/ 5akx7GPGA0dJUjDloLGH6JvP+C7a56/yzeBisuy64mwBtvNZ2vmLcxCjTdQz9H4JDZf0LL hWtXpvNF5HKWNVszvBOh8i002kFmA8zC4EbbAYhigDPjNWDh2Yi87lEYdyT+Rg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752584819; a=rsa-sha256; cv=none; b=EAVt59Ctz4d9AI2tiZ9hu37CExHQWul8ghUbPfLQ5dbFrvFEGYS4QUDQ9hC8MmuEPvyS6+ uKAaROXZDBF3TjECELwns4hg28ubiVEiE0eAtSgyMvZxiPg5dTF/ru/B7plTGoHAo3hFCE /0GPBEVadQ2/be+fe8A2IExw+cjY6WxDi4ttLZeFaaWxkusKv6G3jtt8h45T1TvOu8nU2S onxYIX1dftax7wm4Hfo6bX1FK7L+uLYaLzy3NT96+mYCoHOxfJfn0kc/a9r1i/TgsmetXF Vd3PhEHRXVdabUDpm6hlHMgkLdjr/nToqSDr2m5s8ddFxipRFwNHLPp7qyzUtg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bhKGC2GFHzhNG; Tue, 15 Jul 2025 13:06:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56FD6xbH066825; Tue, 15 Jul 2025 13:06:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56FD6xKB066822; Tue, 15 Jul 2025 13:06:59 GMT (envelope-from git) Date: Tue, 15 Jul 2025 13:06:59 GMT Message-Id: <202507151306.56FD6xKB066822@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 9e8c1f9576e7 - main - /etc/rc.d/pf: Fix for multi-line pf_fallback_rules 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/main X-Git-Reftype: branch X-Git-Commit: 9e8c1f9576e75fcd34007c6e8a4a6da0b1b2f1e2 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9e8c1f9576e75fcd34007c6e8a4a6da0b1b2f1e2 commit 9e8c1f9576e75fcd34007c6e8a4a6da0b1b2f1e2 Author: Michael Proto AuthorDate: 2025-07-13 21:30:28 +0000 Commit: Kristof Provost CommitDate: 2025-07-15 13:06:27 +0000 /etc/rc.d/pf: Fix for multi-line pf_fallback_rules Setting multiple pf_fallback_rules in /etc/rc.conf as per the documentation produces invalid pf syntax due to the lack of echo quoting $pf_fallback_rules in /etc/rc.d/pf. Adding quotes around the $pf_fallback_rules echo maintains newlines needed for valid pfctl syntax. Provided patch resolves the issue Also updating rc.conf(5) to reflect that multi-line pf_fallback_rules should not include a trailing backslash (\) as line breaks are needed when passing rules to pfctl via stdin. PR: 288197 Reviewed by: kp MFC after: 2 weeks --- libexec/rc/rc.d/pf | 2 +- share/man/man5/rc.conf.5 | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libexec/rc/rc.d/pf b/libexec/rc/rc.d/pf index 0b4c086db22b..46fb085e5175 100755 --- a/libexec/rc/rc.d/pf +++ b/libexec/rc/rc.d/pf @@ -38,7 +38,7 @@ pf_fallback() $pf_program -f "$pf_fallback_rules_file" $pf_flags else warn "Loading fallback rules: $pf_fallback_rules" - echo $pf_fallback_rules | $pf_program -f - $pf_flags + echo "$pf_fallback_rules" | $pf_program -f - $pf_flags fi } diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index 2fd63e4f743d..de2181d638d1 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 21, 2025 +.Dd July 15, 2025 .Dt RC.CONF 5 .Os .Sh NAME @@ -1164,8 +1164,8 @@ and is not found. Multiple rules can be set as follows: .Bd -literal -pf_fallback_rules="\\ - block drop log all\\ +pf_fallback_rules=" + block drop log all pass in quick on em0" .Pp .Ed