From nobody Wed Dec 10 00:03:57 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 4dQwtP4W6fz6K3ry for ; Wed, 10 Dec 2025 00: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dQwtP3NgKz3H4C for ; Wed, 10 Dec 2025 00: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=1765325037; 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=q2n4zD8K722SLVjE8mYhZ0isHJTOCDbZddQIeOrKIek=; b=YrSyuV2enr8TeE2qiYxOM+B4KkF0CRQcBf0879YTzdvnxbXS2ZrtsNkKaWGkAh4gbpuSnJ Mwt6wfAl9i811GNelY9sDvsv5S3n5EsHeK4Qhp4lZs9NRmdcuVQU9DRePaUYi1syvzdZhO OgcjUkdwPHVGIvJnYGhfO2MNhD3PyQXDLRtnGfQER1KgnkdeAwTKdGY7zEM6OMPhMfYcYg HX+iy76cOBZqK2c7q23pMi+tuCI2G4S6qI2bcCwnodtZDHgEZguOuAGm3gr/5nfzmJT4Qs BYGGsisCj9sQ1ln8VQtObFqQq6NBeZyjCkn6fHN+4jKjVl+YyiGJAO+z2rk6ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765325037; 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=q2n4zD8K722SLVjE8mYhZ0isHJTOCDbZddQIeOrKIek=; b=XIAd+xO87nw/iF1qLLfypSaAq+tOnWLUv5Bs8nCtggDVGMiY3Y/ulg4khlQ82/6/p2YKWf WffR8cORxrIa9ms28PfjHox653HXVKu7mnOA970oG1oCRNuK9DUV6QsH47T0kFgJ04GU+E mQNtaFw3jxMYHYY9IDLE+cu9ni3iIbHxmo1Tsr16xkRpOUJa55G9xjd3reqhr7IT9d7EDE VuoPar/aga8oVx+509ce6tvLRM3E3xqvdmfKjhcxq92Q90lv6WRRTTESqTj8rGo9nLNbSf d5/udVNpYvG7dGYCU0JF0QLOEYjWaDyBO9STxtt974hoGc4OESQKPzKoyMn1EA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765325037; a=rsa-sha256; cv=none; b=E5U4ktTtmw+tIj2WytiGKhw0xmPeW870ucfKB7MbpBSpXh0irv8BfPiqmLgvvuAsDWkYeQ JeXagPMfED7QDt5X8LS5fc9u/pQk67rQoNEf3Ad+O37hheUo89KXYRiaHSKHC3nMn1aiBb 9k96bvmkQR6SJJQvVSYQ3NkzdMjljNqI7ZgD7q05+9sN4YACLn6q8fPVm/3EehWaY3dZSl KPQz+m58zrnFtiTPiUkfjL2xnF0qZKeNyhY4Lmc2N7lzV3nnjz8p11wt9JK/3Qs+8bRXhU 2GCxD5WT6fGDnFIkiuUyt9Ol4rJBnNG44heW8IPjWIDMuZlX2PGUKSY0XooDDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dQwtP2r2Cz65M for ; Wed, 10 Dec 2025 00:03:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id e858 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 10 Dec 2025 00:03:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: cc1e4aae5a67 - main - rc.d/ipfilter: ipfilter must be enabled for options to take 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cc1e4aae5a67a20f3c0fff13612364e6e4404f93 Auto-Submitted: auto-generated Date: Wed, 10 Dec 2025 00:03:57 +0000 Message-Id: <6938b8ed.e858.115270d4@gitrepo.freebsd.org> The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=cc1e4aae5a67a20f3c0fff13612364e6e4404f93 commit cc1e4aae5a67a20f3c0fff13612364e6e4404f93 Author: Cy Schubert AuthorDate: 2025-12-09 23:42:07 +0000 Commit: Cy Schubert CommitDate: 2025-12-10 00:03:38 +0000 rc.d/ipfilter: ipfilter must be enabled for options to take ipfilter options are erased and reset to default when ipfilter is disabled. This results in nullifying options from rc.conf that were previously set. 8d6feaaaa26f, which added this code, was incorrect as it was for a bug in ipfilter 4.2.28 and no longer applies to ipfilter 5.1.2. Fixes: 8d6feaaaa26f MFC after: 1 day --- libexec/rc/rc.d/ipfilter | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libexec/rc/rc.d/ipfilter b/libexec/rc/rc.d/ipfilter index 1253294b09cf..a68e6f60a6f2 100755 --- a/libexec/rc/rc.d/ipfilter +++ b/libexec/rc/rc.d/ipfilter @@ -33,14 +33,11 @@ required_modules="ipl:ipfilter" ipfilter_start() { echo "Enabling ipfilter." + if ! ${ipfilter_program:-/sbin/ipf} -V | grep -q 'Running: yes'; then + ${ipfilter_program:-/sbin/ipf} -E + fi if [ -n "${ipfilter_optionlist}" ]; then - if ${ipfilter_program:-/sbin/ipf} -V | grep -q 'Running: yes'; then - ${ipfilter_program:-/sbin/ipf} -D - fi ${ipfilter_program:-/sbin/ipf} -T "${ipfilter_optionlist}" - ${ipfilter_program:-/sbin/ipf} -E - elif ! ${ipfilter_program:-/sbin/ipf} -V | grep -q 'Running: yes'; then - ${ipfilter_program:-/sbin/ipf} -E fi ${ipfilter_program:-/sbin/ipf} -Fa if [ -r "${ipfilter_rules}" ]; then