From nobody Mon Jan 29 22:32:08 2024 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 4TP32K0VXFz57ZDD; Mon, 29 Jan 2024 22:32:09 +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 4TP32J5rjgz4ff6; Mon, 29 Jan 2024 22:32:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706567528; 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=xEJkiSOtahbK4PiWBXTKh1EJ5fqeCGMrA1kcsnhmlIA=; b=ymwPACAIL9Ip3BnK/fEv2hRegy+0gehWrhudaNrNEcGLOTIm+vJAsQu7z1hRoLwpvaZSdQ 72XFN9g1q5WT1lDlONH580pJaI+RvUPPWCJhxGETUdhA7mf/l+tNZUzQukAprT9E6d/Gha 7fwtBVDzTWgXxMZGrx4DQRKD53NgXeESfwbuAqnPyOnANI5PUmOQGlrg5LNph0Yosm0DCu 6bPddGmx5gjzOvm6jae/LICS62oEnaBmtZztaRbrZ37UYwJh4e+B/T7UHHm5uUHR3lGZkS yXJC9Hm6/4Ord1AmJEQ9yCNiYM8XvOccGoXzqMDpPpml7xmsBGJ6oEFabSKhQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706567528; 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=xEJkiSOtahbK4PiWBXTKh1EJ5fqeCGMrA1kcsnhmlIA=; b=eJm8gIcXVYsqzV9lUi0jDcMfZM0fAUL54XebrpjA1paZbuvU4iKLsSx3rIdPegYnW5qEL4 z31swbrouWTF549/2YxLW/IdrKTg8PkvqyfUUDLseRRfYwK4VAF+xMFk3L60WGTYWZhAMR kY5N5w6r9uplmqAAA1hK3VIMz9McmOvQH2n9E+n68FPWQXT5sZxMjgXGpRbSsT607NF1lv hXLHFbERwbzAcPtlachqkxqMWwdDa4OCS3hX8EMtfeETFzoibIYIWkA6/ODygxOyvcuR3z jqkL0PPyYRL3708jncGR1inc0f4v2c0hDkJBK0qnBgbCo+imWSMar9PcsRgLfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706567528; a=rsa-sha256; cv=none; b=Tth9KvF3FD3BesZ0k/brJz4Po9Ldrw45m2bYeN2pb1xnrIYRvZFu8cDTCxT8AFwTxeF6KD qeIN5MYwsqIBpmRCXAa2fGdWgDb6qjl/mxyqDMIQ0wEHqs68MbqX7CTptJi9SP16ZNG5BQ NeDpg9w2SKqfo/Ozqm5K6uXnGIqw5+FaUW0dq8rbz+K03CFXKKrKjt39cwZZ7kg7sw1mKx aOifI/bFLupysivXru1iv0OqdHLs3uV7jDXfpLtRaYGuaZLQrSi+ndxS1Y+iqUCeL2JtQw gaS85AlWDLfmCltaThY3BgzYWbOfAcs4IGn87Im4Fyhq2c9Ga4p1VsZCDYB4uA== 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 4TP32J4yY9z18fy; Mon, 29 Jan 2024 22:32:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40TMW8W6013378; Mon, 29 Jan 2024 22:32:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TMW8Vj013375; Mon, 29 Jan 2024 22:32:08 GMT (envelope-from git) Date: Mon, 29 Jan 2024 22:32:08 GMT Message-Id: <202401292232.40TMW8Vj013375@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 0dd1705f5849 - main - setusercontext(): Set umask in a separate function, setclassumask() 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0dd1705f584947625892988afe59e4cedb5cdd09 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=0dd1705f584947625892988afe59e4cedb5cdd09 commit 0dd1705f584947625892988afe59e4cedb5cdd09 Author: Olivier Certner AuthorDate: 2023-06-20 16:46:31 +0000 Commit: Olivier Certner CommitDate: 2024-01-29 21:58:06 +0000 setusercontext(): Set umask in a separate function, setclassumask() Reviewed by: emaste Approved by: emaste (mentor) MFC after: 3 days Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40686 --- lib/libutil/login_class.c | 59 ++++++++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 26 deletions(-) diff --git a/lib/libutil/login_class.c b/lib/libutil/login_class.c index e578925214bd..c8dd2cd66563 100644 --- a/lib/libutil/login_class.c +++ b/lib/libutil/login_class.c @@ -380,6 +380,37 @@ setclasscontext(const char *classname, unsigned int flags) } +/* + * Private function setting umask from the login class. + */ +static void +setclassumask(login_cap_t *lc, const struct passwd *pwd) +{ + /* + * Make it unlikely that someone would input our default sentinel + * indicating no specification. + */ + const rlim_t def_val = INT64_MIN + 1, err_val = INT64_MIN; + const rlim_t val = login_getcapnum(lc, "umask", def_val, err_val); + + if (val != def_val) { + if (val < 0 || val > UINT16_MAX) { + /* We get here also on 'err_val'. */ + syslog(LOG_WARNING, + "%s%s%sLogin class '%s': " + "Invalid umask specification: '%s'", + pwd ? "Login '" : "", + pwd ? pwd->pw_name : "", + pwd ? "': " : "", + lc->lc_class, + login_getcapstr(lc, "umask", "", "")); + } else { + const mode_t mode = val; + + umask(mode); + } + } +} /* * Private function which takes care of processing @@ -393,32 +424,8 @@ setlogincontext(login_cap_t *lc, const struct passwd *pwd, unsigned long flags) if (flags & LOGIN_SETRESOURCES) setclassresources(lc); /* See if there's a umask override */ - if (flags & LOGIN_SETUMASK) { - /* - * Make it unlikely that someone would input our default sentinel - * indicating no specification. - */ - const rlim_t def_val = INT64_MIN + 1, err_val = INT64_MIN; - const rlim_t val = login_getcapnum(lc, "umask", def_val, err_val); - - if (val != def_val) { - if (val < 0 || val > UINT16_MAX) { - /* We get here also on 'err_val'. */ - syslog(LOG_WARNING, - "%s%s%sLogin class '%s': " - "Invalid umask specification: '%s'", - pwd ? "Login '" : "", - pwd ? pwd->pw_name : "", - pwd ? "': " : "", - lc->lc_class, - login_getcapstr(lc, "umask", "", "")); - } else { - const mode_t mode = val; - - umask(mode); - } - } - } + if (flags & LOGIN_SETUMASK) + setclassumask(lc, pwd); /* Set paths */ if (flags & LOGIN_SETPATH) setclassenvironment(lc, pwd, 1);