From nobody Fri Jun 26 14:40:14 2026 X-Original-To: dev-commits-src-main@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 4gmyy65Z3tz6jbcS for ; Fri, 26 Jun 2026 14:40:14 +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 4gmyy64qyVz3X0G for ; Fri, 26 Jun 2026 14:40:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782484814; 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=YvS8A+CmdZfqWu4OkSBCOeFisPrW/pyQoUbFiK4MKrE=; b=KIMsBJkHnWtPtifiDF4HDB0L0Qs6EhQAxHPDW9fNbYBuxFItgRJK2OIVBvoaXWiG/+wC5G 7ZTri+tYJGeuntE4Ef3W2TdsNeWGXtgUDmkjCYTfcNuPaas2xAFZtb4sj9pcBVtsGPvhs2 YM40ZonRaxRR3398lRzP3YqkyKHSZcxt+YCazd8uPb0UtUKIRkmPq97wLrOKDfiPtTXd/t ToUWPaTyJ1YfUDi/ifz6cOlqyG8jeZdboshgnm+GhJN4hUzt1nsU9NYu4hICU7VIkLUIGU uVQy80cu8NE4lFS9dgz0T1Fe79nebrs5aHNw23qDw28MHBFlWMk0LBIBgj37SQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782484814; a=rsa-sha256; cv=none; b=lKOd1HSpIfQt743t/n9NLMT4tZtUe54h4oaKXBtjiAe3BRHyla+KgwBzRyWvD2dBeG/CZz LfLuL4zXz1iRyAJvzgLpoKGKAnXgamVrxyHFIajOpvZliIR5jWDrQb44FCqSvvIQIu8ghf FnPa29il7Sd+LKiDasQ6E8HFp/FFrdHQcItmTcdkEro5wqbZ0ZfdzikJlUytNfIcbhja1G mT0n1m8m8phMnqFn3o9H866qUT5I++h6sbStdRHuvLoq5oL01cU+jlCk9fKU48aSivg3z+ CNgIoAgKGSelaOxY4kQ1z5VyFeqc0+qZGVBJTMbv3Y53OFuXtHdZU1AsRbwF9g== 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=1782484814; 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=YvS8A+CmdZfqWu4OkSBCOeFisPrW/pyQoUbFiK4MKrE=; b=PEBpTEaFDNAZzz66JSegZhQYvfFsx/qpiw47W6voRMKRBrBvC0NFUdsatBCR2Lmu9P2M8P 3/fzRkNCBxKhhx52oEH0G7GppQIaRqtrGOr+LTRmBgJCPJJlvoZqqy0/mI9P1RaMXe0Dwc Z0QFSgYXqHG9FSAQ32jJNOsT3RSlAKX3Bi/WXaq9TYI7HOpYUif99JYHOqsMaHK5A+lo3R KZnI4DnQyVgYRrrqMTrlG4QH4dpIIlDeUsxt3uXqIjG119DXwMHgJHWw2iIQ2/gF7pu+My xRPL3ispQ8DoAgDmBwmL6EBxvui82cQztbiiyoDHMWdZW20Ifycw9OkeGpJfSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmyy63c4kzghk for ; Fri, 26 Jun 2026 14:40:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e256 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 14:40:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: a3c077c1ccbe - main - rc.firewall: Use checkyesno for boolean variables List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: a3c077c1ccbe57ffad6317879bc1e49291892414 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 14:40:14 +0000 Message-Id: <6a3e8f4e.1e256.15b33a69@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a3c077c1ccbe57ffad6317879bc1e49291892414 commit a3c077c1ccbe57ffad6317879bc1e49291892414 Author: Dag-Erling Smørgrav AuthorDate: 2026-06-26 14:38:44 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-26 14:38:44 +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 --- 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