From nobody Wed Dec 10 21:10:16 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 4dRSzY2ryqz6Jg6P for ; Wed, 10 Dec 2025 21:10:17 +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 4dRSzY0Zk6z4F30 for ; Wed, 10 Dec 2025 21:10:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765401017; 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=VuypOgCF7dkC8dhLKBlMCgbd2eNHnP0nEIhFOzF8eE0=; b=ikehpqtEauLofctdYieUKqZ//lIja83yiQqKXMAviLIpGO0/xfldQ5UCrVJ3K/ic2qTLrv LQe5IEnWTwkixqV/sOE/gy3Z/cuuedpskaDo3rARbiRXlFAcETHwOsNoYSAG/+SrSqPhg6 0gVdygWG3bFyTY6eMM/BuFjVCDzavi13HA1TpXybnBkaaXiBqO867wFNRrgXu2uSFRaNaY nGNUTVSoV4DhwqHBWCAd2jnqwQcHSkVeCgysvMvCcsMlixKucNXUlcdFCPrrVlH5NvXCId G18JV/0fNG/xjEC+/ymgbOMEO0NxD5HbmMRhna+UfiXLpPCQhOrorYahJn8mfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765401017; 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=VuypOgCF7dkC8dhLKBlMCgbd2eNHnP0nEIhFOzF8eE0=; b=LHJYltqyr1IdbVnR85tzp8d1q313PiiPz6GxOj5ILUQO4QJ8PId22h+5oa27ow1jRSV0uj j6/HzH3HSnZyNW+6/MhqBA5RYdRpZOdK+WGADzL6Rzy9KZkVSJcAbjpvpB3fB8qv3ebno6 GE6hthYwSud0IuUiYfbX8Yup+lOJTcY92atSDLcMIGVY01PdDd5nh+jm/jpzMtklubu9SR oc1x2/LlJ0GIqWzFZSHk+bahcr2HVB2UPaYuq64hNav3q3lSJE/JxmKvrNMw9HhH3MqMXT LEhY63VhbcNyHROvFyWhLT5zdq8BbE7/DlmzYZsZphNPFyIml7hE+8v8nf9U3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765401017; a=rsa-sha256; cv=none; b=J+MkqGw96UDGt13vVr7o1bsGE5cMZ8hCDMu7RC0WjHzs09ExZRwNFr2b1e1sRnEP77f4Km uKzAr7eo5eaxbUG8eyGeC+muEk7guEf+cyoD6yPJH1+r+eRHfuN79uAcyLh4kJvAFLt8Iv wUnzsxoQ0t3wAOMVajFkgcC9zKOq4EBLHRoLAOjxQy0HRFq5FOQ+ddGHDzGY+SO9uMhVYU o6/5e46IxXcXgFH/kLBsYRhGqWJpG1ClSUg31OhHe/6slT6gpKaAVqmYqJ65UaZvOTN9Lb SO/slAJ4314JS/YlsgqYK9QBotx2yjY/pvDlS4oAKo8W6AzFv15YNdVltml/qw== 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 4dRSzX5qVXz11Km for ; Wed, 10 Dec 2025 21:10:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30b44 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 10 Dec 2025 21:10:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: d9b9de6608b3 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: d9b9de6608b3cbca03f1448595bb12c87a0f99b5 Auto-Submitted: auto-generated Date: Wed, 10 Dec 2025 21:10:16 +0000 Message-Id: <6939e1b8.30b44.235e96e1@gitrepo.freebsd.org> The branch stable/15 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=d9b9de6608b3cbca03f1448595bb12c87a0f99b5 commit d9b9de6608b3cbca03f1448595bb12c87a0f99b5 Author: Cy Schubert AuthorDate: 2025-12-09 23:42:07 +0000 Commit: Cy Schubert CommitDate: 2025-12-10 21:10:07 +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 (cherry picked from commit cc1e4aae5a67a20f3c0fff13612364e6e4404f93) --- 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