From nobody Wed Dec 10 21:10:35 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 4dRSzv6GKZz6JgSK for ; Wed, 10 Dec 2025 21:10:35 +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 4dRSzv4tS2z4Fpl for ; Wed, 10 Dec 2025 21:10:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765401035; 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=GmazqeYXuYWFBnIqkJqWu8ztCTj+Pi2Nt6XQUaAbVSU=; b=skIAG2+qfeObL04fOSj+hAyVX3lMLq2v1UIYt1X4KOX+sAyvmFsLD6liuk5gxxDAa/Dls3 ViH1ITCqjY4gMQuDGXu+g3NBmwiedDHPlKhru+4xc4FN4L8FfaLrb3rpQ+W9tHYK/8j+qw 7W9W2vfhc3Bek/uTXfc54hD7TKz4jza/aG3QoqruyA613rGfouzUabaIk0MtB8ugL5B8dH zKZYJIx1wX5iBqLZncXXS6fVCHX49NKa2nbRBa+wJZvuqknPWCW/gDLWal0ZCihnxv2CQq 1EUnsp4ziYDn+m7f2Lktq7x7BufM0BvTibi4C6/MWtAzMSXxQnCxjNlbACkghg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765401035; 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=GmazqeYXuYWFBnIqkJqWu8ztCTj+Pi2Nt6XQUaAbVSU=; b=oZhLLTQtWcrD9FuL2ZoSlVhF67cMGvdvyTzmi9iakxwByvrVZOu5ufxojRDDsuZwZaojSx feUDZ9VgI90YbqtcDHqSp8xpBUQx2qL1stqW0D7TBA2E7ea1hT8Vw+CgMRgvIhJuy4Mk8T ihcpY4VaxC1BZsfxTPhM/3DcA+pUEADC8S/UBoAuli8vlaK4slF7CvM2s2hq1Do+nX5Bc9 AYsEmxjDIvz5wyQmfYuwy/eRx02d9fGcr9OpAcXxpPFuzynulkNvjboa/IX8Gia4vnSw0q o98cWPW05uo5ZLF71WqmrJJ8iPfSnvffGOSmi1LIDl0fnYkjnT/DqtzcN4QpyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765401035; a=rsa-sha256; cv=none; b=bH8SbjpMuupvoGrsk97vl4KEVcs4odZs67u4FmpffjD1ElW8U8gt0+GAo9nzdxZRmU92yY Mllx6nRw9nO3+LO0R89t/8K5AGCiNUjJD3lfcxVP1iuCyCjCjVWSIM7oJZY9dt9N7+gq3Z CMaMmOjf/+vFltg0mRsmeUwr++XFacVH/HVkMgGCcSHZoay7THXVNnYgSD7E7WaOAIaIvY VmkZ6Tbbk/nN5LOsaLQu67sIGXqW/wmKeLk5n1V7w083sXwpYMMqfA98JfGEqLnT+IPjgN +s2C0b9POHJ7R+/K7lEDinf72NoYPc4knBtj9ms4FOsk/8tQCGt6Zk1Jfw/eFA== 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 4dRSzv4N30z127m for ; Wed, 10 Dec 2025 21:10:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30bd8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 10 Dec 2025 21:10:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 0ce6b2f829dc - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 0ce6b2f829dc403520f57b62dde0c52f50bd5303 Auto-Submitted: auto-generated Date: Wed, 10 Dec 2025 21:10:35 +0000 Message-Id: <6939e1cb.30bd8.25bb0772@gitrepo.freebsd.org> The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=0ce6b2f829dc403520f57b62dde0c52f50bd5303 commit 0ce6b2f829dc403520f57b62dde0c52f50bd5303 Author: Cy Schubert AuthorDate: 2025-12-09 23:42:07 +0000 Commit: Cy Schubert CommitDate: 2025-12-10 21:10:29 +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 e6cc99cdbcde..319414688381 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