From nobody Sun Aug 28 05:49:23 2022 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 4MFjLq6Sygz4Zrp7; Sun, 28 Aug 2022 05:49:23 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MFjLq5mJ0z3dpr; Sun, 28 Aug 2022 05:49:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661665763; 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=4XmduBoucazVasrfdr0y8TDOFg+XtGQpSR3Fo7aRGtI=; b=NJhZPp1A55AIoSteXlZbknnlWMBl5j/qgI7B+MGMFeQylX2EDdr8r3sn6XKoxLneDE2V1P NrVSbNnlmDJ0N5eWeh1QQiRGE6wlWI12rfuEmKj8KEGe9gPssBriyc9SGDEbxKg/TlRGEP mXe3wmeiy0rVwRm0zYrW17vyK/XDzc0CkD0EnaB8hCKtsVIkcjd9vasPLQDuNaG9sUzRsO yjDUKQeu2YEDSOVbmQFjn4G6xicWWPqNyDdfD8eLstX9ZsNTNflmDFrKKwBVARIs6jb4Eo KK8ibsVWUXQG3v9cVEtku2r/34qRof0VTV8N+eXfN+bOq8IiQv7hoVWDxdOGZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MFjLq4ZDLz10RL; Sun, 28 Aug 2022 05:49:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27S5nNch082687; Sun, 28 Aug 2022 05:49:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27S5nNFk082686; Sun, 28 Aug 2022 05:49:23 GMT (envelope-from git) Date: Sun, 28 Aug 2022 05:49:23 GMT Message-Id: <202208280549.27S5nNFk082686@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eugene Grosbein Subject: git: 160a2f2cdda8 - main - rc.conf(5): add _umask to run the service using this value 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 160a2f2cdda806e104c0d3194bfb84b208ad1ae8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661665763; 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=4XmduBoucazVasrfdr0y8TDOFg+XtGQpSR3Fo7aRGtI=; b=Qhy4QxfPEAgTxnjCQsbZdVMjHURu1335HVswP+Xqkn6odaAqPN1ifjoor7xViTUqrBI/Cu K/Nze4s+unuqb8lwHhbBMdGJm8jGYEU9wzfFVyK3aCFHUQR1xICiNEJa9sbIKwSSjl/iCI I1iVyOjZ0+e3bLL9L+1Sv4Kx3KmnoIYpyZvk3MPsHF6Qbpq0K7zvxljFA9KlmWk8ElyNrj az024wyPlS2U8O1bk0lrvI9E6ad4EXIA3+YTzhNKNwhngWuZ0KBEGe+EMCKVvpVr4mf5yi eEpNOu9k0RKmiqMyC/v2HpDwHzPQrYT3A4wTZAl4MCjGqL5gSXxrStblb69Gsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661665763; a=rsa-sha256; cv=none; b=tb/sPkcWcXczGysTmZJd9rywLNUTeTkAcfilO2h4IRXFwkn2me0u4aBU+UmWFg9Q730IVv IeIDCs30wUTcqV/P3aVianPoF0tUBy5ajAR+XgEuAXP+OY0wIf91awsy7SDbsd+An3m9Br 6NXUXFmgJQ09IHFSh0VdXJaDWG3cnbEfkDhGp1GdA4dVcsasMZ78kpLhnAFmPhwc8aI9CE PPgM4PiDoxpnGOs7+RcftuM5g6MHt5nwq26YCOQFRA7VvBUyuleSPmLqzrTVC2yL8/+Mq4 2wn55lT4t0Zorw5kVtgYGeBZChoL6ip/nu4hBo8ZVEnRrRwEGGWgY/GZ53M70Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=160a2f2cdda806e104c0d3194bfb84b208ad1ae8 commit 160a2f2cdda806e104c0d3194bfb84b208ad1ae8 Author: Eugene Grosbein AuthorDate: 2022-08-28 05:45:23 +0000 Commit: Eugene Grosbein CommitDate: 2022-08-28 05:48:58 +0000 rc.conf(5): add _umask to run the service using this value None of tools working with login classes change umask(1) and we had no ways to specify non-default umask for a service not touching its startup script. This change makes in possible. Some file-sharing services that create new files may benefit from it. Differential: https://reviews.freebsd.org/D36309 MFC-after: 3 days --- libexec/rc/rc.subr | 10 +++++++++- share/man/man5/rc.conf.5 | 8 +++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index 9ae93dc391a2..81bef4f05fe0 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -791,6 +791,8 @@ startmsg() # # ${name}_oomprotect n Don't kill ${command} when swap space is exhausted. # +# ${name}_umask n The file creation mask to run ${command} with. +# # ${name}_user n User to run ${command} as, using su(1) if not # using ${name}_chroot. # Requires /usr to be mounted. @@ -996,7 +998,8 @@ run_rc_command() _fib=\$${name}_fib _env=\$${name}_env \ _prepend=\$${name}_prepend _login_class=\${${name}_login_class:-daemon} \ _limits=\$${name}_limits _oomprotect=\$${name}_oomprotect \ - _setup=\$${name}_setup _env_file=\$${name}_env_file + _setup=\$${name}_setup _env_file=\$${name}_env_file \ + _umask=\$${name}_umask if [ -n "$_env_file" ] && [ -r "${_env_file}" ]; then # load env from file set -a @@ -1357,9 +1360,14 @@ _run_rc_postcmd() _run_rc_doit() { + local _m + debug "run_rc_command: doit: $*" + _m=$(umask) + ${_umask:+umask ${_umask}} eval "$@" _return=$? + umask ${_m} # If command failed and force isn't set, request exit. if [ $_return -ne 0 ] && [ -z "$rc_force" ]; then diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index d86af5a0f224..8592739ccb49 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 7, 2022 +.Dd August 28, 2022 .Dt RC.CONF 5 .Os .Sh NAME @@ -239,6 +239,11 @@ such as PostgreSQL will not inherit the OOM killer protection. .Pp This variable has no effect on services running within a .Xr jail 8 . +.It Ao Ar name Ac Ns Va _umask +.Pq Vt int +Run the service using this +.Xr umask 1 +value. .It Ao Ar name Ac Ns Va _user .Pq Vt str Run the service under this user account. @@ -4691,6 +4696,7 @@ The default is 10. .Xr limits 1 , .Xr protect 1 , .Xr sh 1 , +.Xr umask 1 , .Xr vi 1 , .Xr vidcontrol 1 , .Xr bridge 4 ,