From nobody Wed Dec 10 21:10:53 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 4dRT0F6NSMz6Jgl3 for ; Wed, 10 Dec 2025 21:10:53 +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 4dRT0F3pPFz4GQ3 for ; Wed, 10 Dec 2025 21:10:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765401053; 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=AglzVKHTURQbzI0P8uUGmzg4FBgW+kr/EpbqFG2MChU=; b=P0guf1l2+pyTSqO8j0jB/zEf2Ik7C53Aa8msRS14BRvzKgPfGjs0G4JkrfNqrCVsjVkRAc eF6Mo2BFxO9b9t2iwGHwr4tVyv0op6YNWaRwHXoTxihC2HrtoRrObjF1Di2fRu8e855q7o 8YjdGOXa1h8hrWSe04nIlN3sNZHYH3RHewG7lrID0tFIYW3Seb/6n2dNW//U8TQUpedwsg GKgA12Xb9OtlBZDMrmWU9xmWENCnc68ub4ifUnhG5PfKWQwhwkstyOSsChhmQsIXZI76j/ 2GjlEGoyDZh7rwZyrCe6QenbIHNflEqCtdT4pV8YHxCYOkrCV3zAHc/j2SWoMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765401053; 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=AglzVKHTURQbzI0P8uUGmzg4FBgW+kr/EpbqFG2MChU=; b=NbkWB71U/lWuw8QEDSJMclFPoVz+huX07vxww09hhFIiDc2GSC0VrdTBvMeGXIuMJ/ohdT 83mDse+oFwVraf4ymQXsakcCVVtJx6gvNhg5pMrj6zNgkt7ja60DEbcF6X/CK0tf5CkXPZ FTlWEjvMuMbafRWmPLFacWarhfqDaXD78+Pdpmg1B9Hi1wQnOzkt/PBLYXj7Fb5JZeP8qf hwdQd5CmNZDDL/RMaXmCrxfftcIhh8+zPLZFmwkP/5GVZyX5uZqH2/FFaRBvAMZ1mU6ljr FMussYUmL4DYGcebou3be55EPpVwg/f+PP1eYO0kqC5s1bOuYZuVqQFsMikvRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765401053; a=rsa-sha256; cv=none; b=jHTiglNlk4sKc3ZcoZWGqbAbMTxVr3Ij9cs4VS1RUe4/do9WIbMFNyfNJcJALLiBFBs4FZ oNs4dj4gdccaYKS9f4iww1qlNZOl2vGx3L54rdHOGtEkHkYPYU30T54RUB6yKlip4sJPzX YD1SfXkqwBJxxRIlrizxLf17b9PrDCZD4tai3ZCR+p+8+O0Jl+22DDDgt6XiZHXvLTQSJD UoGjgMXi10DTZbeV4tI13aa2gmFSdBHvQsAawArhJ7P+9JmV4vZawoC0jWQX0OP+ZuJW4U BzxIDf1Thwvd+e1EtpUbI5TyO90YDQJJSs3h8Rr5CQ2pfmLp87jFR7+48y7txA== 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 4dRT0F2VPMz11Zl for ; Wed, 10 Dec 2025 21:10:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2fcf0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 10 Dec 2025 21:10:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: d077ec7c0fa3 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: d077ec7c0fa3d1fef03cbd63e1b70dae625b05b7 Auto-Submitted: auto-generated Date: Wed, 10 Dec 2025 21:10:53 +0000 Message-Id: <6939e1dd.2fcf0.7e6f15ae@gitrepo.freebsd.org> The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=d077ec7c0fa3d1fef03cbd63e1b70dae625b05b7 commit d077ec7c0fa3d1fef03cbd63e1b70dae625b05b7 Author: Cy Schubert AuthorDate: 2025-12-09 23:42:07 +0000 Commit: Cy Schubert CommitDate: 2025-12-10 21:10:47 +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 449b8f0741b8..f027faa9d13a 100755 --- a/libexec/rc/rc.d/ipfilter +++ b/libexec/rc/rc.d/ipfilter @@ -30,14 +30,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