From nobody Tue Jul 7 06:38:44 2026 X-Original-To: dev-commits-src-branches@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 4gvWlS525Xz6l171 for ; Tue, 07 Jul 2026 06:38:44 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gvWlS4Yzsz420q for ; Tue, 07 Jul 2026 06:38:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783406324; 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=AInggk40JWXdWWQfcIV48g+ZwN04prCkBvEThuEMZLA=; b=hNxhOdiBxkNwDhLtdBmmg7uEBxOzgFH9yCIWdJohfBJoRg1ugvPrCacxnS//YPq3yMuFaf Bu1gj+okZmoW6nrrhz59pbYI713ujsy/6kToeOxBqpazMmjY+6megQEnv6wFlFlbinghEZ WZjXPPMkYW2kwFsLshzCHmz+uq+YUq/6pP5Gp+EcGOWDjRHNPOpOYL7xTIYlkpWNcBXfY7 LfiwZf0JDTfF7opwv0BS8aN8cm8Jq0w+o95ytpwdymGaw27sWnNkvdxsf87EHD1qVpYQKD zK2zLQZfabHXg/+A6Adk9YtPvaEDK/HBhQvpM+1bJm7wSZY9uIbvsWStRRDhXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783406324; a=rsa-sha256; cv=none; b=gXPWxwJyOo76mV/qF00XkyX5V4UpxpBlclGxSrdcSm53RIEs1sdY668KR8y8Yac6m0tm+F dRx5Yua/4XuIMiSrqoK4FFtzydsW8cnS0fwBdTvQmrus8wwWEpB9jdt+xrspJmf4eHkIHV 8bfFIHSxFzWUDyI7HT4nu9I90p5QXNSTpmOyw43Aar0KJ+lagryUU4WBtFJrUUVTpmtJEk 2NaNQJ+aT1HeeFHJxPR2VRl/0r6owH+W+qfUazJAlTIhWvKb4o9NiIueumkf3RiWcnyXKa F+26lLAkdacbAAIv/GukJJt0tgNbuwEO9OkOBIex3NxvslMI2ZvJPKJoeScexg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783406324; 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=AInggk40JWXdWWQfcIV48g+ZwN04prCkBvEThuEMZLA=; b=FKK0jVtoLy8/qziE5hP0ohsfja3U2trS3Sy3jz8H3/8CVTYcbJoNvKvsbytXttKSyRAqIR oZNLLT8SALKPP2JTXlpHvkH03Pody03gusE58BGfL1Ysu6D7HKi8PEXmLRWbJMvEY2hFLT vjqyhjz47sLRQ3EQOtB6esrFd59gpb4Vn3gGYnh91iy5C9tjE2PKDS7p5/h+dC5kl0O42M ZlLEimDuTvRX0woWSDLZ4HkTifO+d90Fx9k5Z3N4iCUsnno44wXcWw30AsXVotj2RLDimc 0szPle4JIY899+uuNYKDjjFm83lvgaTGNrhpsWTSxyGBvelAD7IAINpnTqkF0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gvWlS2xwqz833 for ; Tue, 07 Jul 2026 06:38:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3681f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 07 Jul 2026 06:38:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 90244a31a076 - stable/15 - rc.firewall: Use checkyesno for boolean variables List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 90244a31a076459722c26cecc5be6d50556d4e5d Auto-Submitted: auto-generated Date: Tue, 07 Jul 2026 06:38:44 +0000 Message-Id: <6a4c9ef4.3681f.3a691fc7@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=90244a31a076459722c26cecc5be6d50556d4e5d commit 90244a31a076459722c26cecc5be6d50556d4e5d Author: Dag-Erling Smørgrav AuthorDate: 2026-06-26 14:38:44 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-07-07 06:38:10 +0000 rc.firewall: Use checkyesno for boolean variables Use the checkyesno function from rc.subr instead of hardcoded checks for boolean variables. Also drop an incorrect comment about the default logamount value; the actual default is zero (unlimited). MFC after: 1 week Reviewed by: kevans, allanjude Differential Revision: https://reviews.freebsd.org/D57678 (cherry picked from commit a3c077c1ccbe57ffad6317879bc1e49291892414) --- libexec/rc/rc.firewall | 53 ++++++++++++++++++-------------------------------- 1 file changed, 19 insertions(+), 34 deletions(-) diff --git a/libexec/rc/rc.firewall b/libexec/rc/rc.firewall index e4fc8cc3db78..65bf1cc54f85 100644 --- a/libexec/rc/rc.firewall +++ b/libexec/rc/rc.firewall @@ -131,14 +131,11 @@ ipv6_available=$? ############ # Set quiet mode if requested # -case ${firewall_quiet} in -[Yy][Ee][Ss]) +if checkyesno firewall_quiet; then fwcmd="/sbin/ipfw -q" - ;; -*) +else fwcmd="/sbin/ipfw" - ;; -esac +fi ############ # Flush out the list before we begin. @@ -159,27 +156,19 @@ setup_ipv6_mandatory # case ${firewall_type} in [Oo][Pp][Ee][Nn]|[Cc][Ll][Ii][Ee][Nn][Tt]) - case ${natd_enable} in - [Yy][Ee][Ss]) - if [ -n "${natd_interface}" ]; then - ${fwcmd} add 50 divert natd ip4 from any to any via ${natd_interface} - fi - ;; - esac - case ${firewall_nat_enable} in - [Yy][Ee][Ss]) - if [ -n "${firewall_nat_interface}" ]; then - if echo "${firewall_nat_interface}" | \ + if [ -n "${natd_interface}" ] && checkyesno natd_enable; then + ${fwcmd} add 50 divert natd ip4 from any to any via ${natd_interface} + fi + if [ -n "${firewall_nat_interface}" ] && checkyesno firewall_nat_enable ; then + if echo "${firewall_nat_interface}" | \ grep -q -E '^[0-9]+(\.[0-9]+){0,3}$'; then - firewall_nat_flags="ip ${firewall_nat_interface} ${firewall_nat_flags}" - else - firewall_nat_flags="if ${firewall_nat_interface} ${firewall_nat_flags}" - fi - ${fwcmd} nat 123 config log ${firewall_nat_flags} - ${fwcmd} add 50 nat 123 ip4 from any to any via ${firewall_nat_interface} + firewall_nat_flags="ip ${firewall_nat_interface} ${firewall_nat_flags}" + else + firewall_nat_flags="if ${firewall_nat_interface} ${firewall_nat_flags}" fi - ;; - esac + ${fwcmd} nat 123 config log ${firewall_nat_flags} + ${fwcmd} add 50 nat 123 ip4 from any to any via ${firewall_nat_interface} + fi esac ############ @@ -320,13 +309,9 @@ case ${firewall_type} in # translated by natd(8) would match the `deny' rule above. Similarly # an outgoing packet originated from it before being translated would # match the `deny' rule below. - case ${natd_enable} in - [Yy][Ee][Ss]) - if [ -n "${natd_interface}" ]; then - ${fwcmd} add divert natd ip4 from any to any via ${natd_interface} - fi - ;; - esac + if [ -n "${natd_interface}" ] && checkyesno natd_enable; then + ${fwcmd} add divert natd ip4 from any to any via ${natd_interface} + fi ${fwcmd} add deny all from "table($BAD_ADDR_TBL)" to any via ${oif} if [ -n "$inet6" ]; then @@ -533,8 +518,8 @@ case ${firewall_type} in # Deny and (if wanted) log the rest unconditionally. log="" - if [ ${firewall_logdeny:-x} = "YES" -o ${firewall_logdeny:-x} = "yes" ] ; then - log="log logamount 500" # The default of 100 is too low. + if checkyesno firewall_logdeny; then + log="log logamount 500" sysctl net.inet.ip.fw.verbose=1 >/dev/null fi ${fwcmd} add deny $log ip from any to any