From nobody Mon Dec 8 14:17:39 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 4dQ3wN0Bpzz6JsPx for ; Mon, 08 Dec 2025 14:17:40 +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 4dQ3wM6mvlz3qJ1 for ; Mon, 08 Dec 2025 14:17:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765203460; 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=TdYGVgAQNFTf9sJy7rrQdQwSw52wEJIVsosoHYSBSkM=; b=bHPGa7jcWMTRh8VfEgTiNpxKkEDQh3MpZ298MYucc5pZ19gjHsImAiXlrROd/1B1e//6X6 UKDrnC3eHUaBhgtqeBHYq3vuOq/mzZFwIpVpi50p+WcU/h8AnX4VeGdkS0KbeHFmcI9Uwn /JUna4mxB6SmDXxh1/8Clmlnod8OI1/KNa1UQabXPCx4cAwcdwi1EoVRj51xb6msGgydLx ioHsx8ccagf2XMZ2sPmMc6G/YDmxmhqtMOgifV6NSedeXXAAh1ABfdltksy19lQ6jFdLko oFNcGPsSvTC9LMvrpqzp0JSYiPWhHdeMJAgP+oPR8KPm+z7I+p5vqgKxRdemqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765203459; 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=TdYGVgAQNFTf9sJy7rrQdQwSw52wEJIVsosoHYSBSkM=; b=AqCvRjJTfyAseMDxEsPVa7tzguFBhBRTbbIz1jtWjT6tkhNEWGuVf/fpmUW/3xRBl38kIz 8YpeNJL4ewjG3svxcRquqa4Lu13VjtenYa1T9BEU8a40RBkQDfvy8neGHaTb1uG17F9zTE zIRvyDdffGj9bQhhLw1OrRIO1hwoZERX8Ltw8IAKCYZc61apcmEwhDOyHozVNWKPwyPGJX 5Zqy5JViUlb3rO5n+ef7iZGLq2ma/bUCOPGWlG2kaWrqQDZ/LZ/kH6fVXD/wPa1knJc4kS hb8Q3ie9+7QqWlwutI+R+A8i1ESR4rSmJcA76gqNRK8BrK/DdeXbgr1+/lM+KQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765203459; a=rsa-sha256; cv=none; b=fGHn5s+ZVhIfoBbTJxeFtV/iFVhPqMNGrXY3yy0TNqmVm640wskJ8Qmx72dwErlo/nQ9ut 4EbNO/GyEmFuP4RiZ+LY9b7PzkqKB276MSrKiuXzSjrB4OkAGn4TQOXVQEDvdDjPt/HNMn BnxxT6/XdVBaAWI8N3IRdiWRv1s2EKAsQchGexmwi0WgXVtlbk9JAwJRJa6aLmwjZKxMi6 QMGLEyyBtNhHmO90z3t8J5FkFD0vZucFZRD+FFJ//tJiIbACqyXfVopCRuX5s+CAJFuX1h onDWGg/GXDsOSaX4nleoYKFYbXHxpXci5UYZHZFlQ8ecxreGecgt+2iDTJOa/w== 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 4dQ3wM67Kzz1Qd for ; Mon, 08 Dec 2025 14:17:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2feac by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 08 Dec 2025 14:17:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: cd0e5f95d070 - stable/15 - rc.subr: Try to make svjc option handling a bit easier to read 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cd0e5f95d070d832675b8b9af696ed366d8fdb2c Auto-Submitted: auto-generated Date: Mon, 08 Dec 2025 14:17:39 +0000 Message-Id: <6936de03.2feac.6fecb084@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=cd0e5f95d070d832675b8b9af696ed366d8fdb2c commit cd0e5f95d070d832675b8b9af696ed366d8fdb2c Author: Mark Johnston AuthorDate: 2025-11-17 16:39:43 +0000 Commit: Mark Johnston CommitDate: 2025-12-08 14:14:57 +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 (cherry picked from commit 7861d051de2ea2f244bcf73111a04389dc5bcf51) --- 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 8317ff5c0922..ec4970c8db94 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -1246,49 +1246,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 "