From nobody Tue Nov 18 16:24:39 2025 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 4d9qh75wTPz6HP4w for ; Tue, 18 Nov 2025 16:24:39 +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 4d9qh754Hvz4J6H for ; Tue, 18 Nov 2025 16:24:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763483079; 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=L7CIjQ07MQf4x0arKpdpp71fjF6O2JLD1LN6+rj6Jmc=; b=lu07q0PjzF6oNXiIyYqNej7g6cnpgKFeWZIpYEe4FLCxVHta7+cYXx1b1Pnw5AAGR3BaqP ebx+NieGisk6TqAIeGuQCKPLeqA+L1cta3Jqu+m0oGkqFFAtBcnVRl2R5psUEWjrQxmXLF J7TZjfLkjfKiic4XRPoMiu6D6gjqjXMEl9b0YtE9uz1gbKbZv7XsZNkd2Bol9knii42qL5 sVxiiEEQuy2aoNUCX67IESQfxwBqshnm43KO9lJpPhrwURT8mxuyhA1GWrOQUffYqGT/9I Hl+OldcGi2tYARTj9quoHlVa+tIItvILmh0KJpsZgBkFl5uTS6TUAaE0vB+WoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763483079; 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=L7CIjQ07MQf4x0arKpdpp71fjF6O2JLD1LN6+rj6Jmc=; b=IUpvdV9zAkE6fYMwrnK1UdkMFMiXSLvhgI9aAfwv6MAsolpDfMA50n1n6XAUwOtL0k8zOn mOqd90QK5qbqwK+7b51Lcb7Upj1LgKFtUsT7EkEd9l7XGSSwmKBz4PzB3ZCFgk4HowLwvN kHCjnLXgb7p7zIuiyB6XYcnzXd7bvMeGbUx0mvo9ajO4/KNeeBhaXXZGVPPo6T118HXhY4 CaEbWt2/Che2wKJrXsDjehISb40m8M5+sCqDpCmgebVj8I3K5gKtvRumSSYCLhhz+Tw+DF xuWaYMvkPt2Nk83HRCsXgMWn6T1M60Dv5REuyA8djvGxczjYeRtWnwuGxMvl+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763483079; a=rsa-sha256; cv=none; b=MWz9N5VoPUN4x76a5BJeIR/6olzMPgjQcc5dcEHXh1z2xLKu3bnov8aXty5TbZlvB83jxf WqSTx6+TMQ7qjGa4/x1KeQtmRtuJtjnyT5k2KehsEcN06ybI5n1ePOhhLfjt5q3xiuQO6o 2e8AUfkKb+rEb8GUdki6JZGZWl1lv9LPozSLD/OwXAU+rgJbsyme0OmI8J1BauNlumxUGa dlf38Ww5NS5BXAJeWoZ8+qLjkuHPQ6nrkY6YCNELZmpP4aTYQuSI8kaigWzaT7MFQh6M/e u/egaKnZb2S6I9jXYF3HO0JE2mkwKKE15qrM6qAyTcFeHQiLZ/cMtFjUaO8GnQ== 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 4d9qh74cHVz12Bs for ; Tue, 18 Nov 2025 16:24:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f03c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 16:24:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 7861d051de2e - main - rc.subr: Try to make svjc option handling a bit easier to read 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7861d051de2ea2f244bcf73111a04389dc5bcf51 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 16:24:39 +0000 Message-Id: <691c9dc7.3f03c.367c511b@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7861d051de2ea2f244bcf73111a04389dc5bcf51 commit 7861d051de2ea2f244bcf73111a04389dc5bcf51 Author: Mark Johnston AuthorDate: 2025-11-17 16:39:43 +0000 Commit: Mark Johnston CommitDate: 2025-11-18 16:24:20 +0000 rc.subr: Try to make svjc option handling a bit easier to read Specifically, make this code fit in fewer columns: - deindent cases to conform to the usual style, - use a local variable to minimize duplication in each case. No functional change intended. Reviewed by: 0mp, netchild MFC after: 2 weeks Sponsored by: Klara, Inc. Sponsored by: Modirum MDPay Differential Revision: https://reviews.freebsd.org/D53754 --- libexec/rc/rc.subr | 88 +++++++++++++++++++++++++++++------------------------- 1 file changed, 47 insertions(+), 41 deletions(-) diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index e4ad14f582d6..4718123a71e9 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -1256,49 +1256,55 @@ run_rc_command() if [ -n "$_svcj_options" ]; then # translate service jail options _svcj_sysvipc_x=0 for _svcj_option in $_svcj_options; do + _opts= case "$_svcj_option" in - mlock) - _svcj_cmd_options="allow.mlock ${_svcj_cmd_options}" - ;; - netv4) - _svcj_cmd_options="${_svcj_ip4} allow.reserved_ports ${_svcj_cmd_options}" - ;; - netv6) - _svcj_cmd_options="${_svcj_ip6} allow.reserved_ports ${_svcj_cmd_options}" - ;; - net_basic) - _svcj_cmd_options="${_svcj_ip4} ${_svcj_ip6} allow.reserved_ports ${_svcj_cmd_options}" - ;; - net_raw) - _svcj_cmd_options="allow.raw_sockets ${_svcj_cmd_options}" - ;; - net_all) - _svcj_cmd_options="allow.socket_af allow.raw_sockets allow.reserved_ports ${_svcj_ip4} ${_svcj_ip6} ${_svcj_cmd_options}" - ;; - nfsd) - _svcj_cmd_options="allow.nfsd enforce_statfs=1 ${_svcj_cmd_options}" - ;; - routing) - _svcj_cmd_options="allow.routing ${_svcj_cmd_options}" - ;; - settime) - _svcj_cmd_options="allow.settime ${_svcj_cmd_options}" - ;; - sysvipc) - _svcj_sysvipc_x=$((${_svcj_sysvipc_x} + 1)) - _svcj_cmd_options="sysvmsg=inherit sysvsem=inherit sysvshm=inherit ${_svcj_cmd_options}" - ;; - sysvipcnew) - _svcj_sysvipc_x=$((${_svcj_sysvipc_x} + 1)) - _svcj_cmd_options="sysvmsg=new sysvsem=new sysvshm=new ${_svcj_cmd_options}" - ;; - vmm) - _svcj_cmd_options="allow.vmm ${_svcj_cmd_options}" - ;; - *) - echo ${name}: unknown service jail option: $_svcj_option - ;; + mlock) + _opts="allow.mlock" + ;; + netv4) + _opts="${_svcj_ip4} allow.reserved_ports" + ;; + netv6) + _opts="${_svcj_ip6} allow.reserved_ports" + ;; + net_basic) + _opts="${_svcj_ip4} ${_svcj_ip6}" + _opts="${_opts} allow.reserved_ports" + ;; + net_raw) + _opts="allow.raw_sockets" + ;; + net_all) + _opts="allow.socket_af" + _opts="${_opts} allow.raw_sockets" + _opts="${_opts} allow.reserved_ports" + _opts="${_opts} ${_svcj_ip4} ${_svcj_ip6}" + ;; + nfsd) + _opts="allow.nfsd enforce_statfs=1" + ;; + routing) + _opts="allow.routing" + ;; + settime) + _opts="allow.settime" + ;; + sysvipc) + _svcj_sysvipc_x=$((${_svcj_sysvipc_x} + 1)) + _opts="sysvmsg=inherit sysvsem=inherit sysvshm=inherit" + ;; + sysvipcnew) + _svcj_sysvipc_x=$((${_svcj_sysvipc_x} + 1)) + _opts="sysvmsg=new sysvsem=new sysvshm=new" + ;; + vmm) + _opts="allow.vmm" + ;; + *) + echo ${name}: unknown service jail option: $_svcj_option + ;; esac + _svcj_cmd_options="${_opts} ${_svcj_cmd_options}" done if [ ${_svcj_sysvipc_x} -gt 1 ]; then echo -n "ERROR: more than one sysvipc option is "