From nobody Thu Feb 01 21:26:04 2024 X-Original-To: dev-commits-src-branches@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 4TQsQj4mdSz58hG2; Thu, 1 Feb 2024 21:26:05 +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 4TQsQj259kz4WB7; Thu, 1 Feb 2024 21:26:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706822765; 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=JCS/vocxEo5sQ9yJtKVW5KpaXpNMU0zbbcljCCKWQDM=; b=fPoUE2+us9gubcHLVrCFTKDTCQzbg509ocP0JGVihnQ/ynEL/fOoOc5wnKcZt6l2CZ6EjF fnKWuksW4BLLcJnvRgwUY9TFmsXy47WZbwa1Tf16jylxIxqDh0XIBz1A3hTDnzwAa2xSsA WPlhaKwYEH61F80ZHXGTxl3CG1wCN8lAvqqxvXeDYlAiNubyfDC4tCEkdza1uqQf4CaWRl cCLD3K9fRAnqHnjUkG9h8xSLeji4d0Gd2y3Z8VWa2JJ+LQjFWnVLfI2bZZBL0p+wkcW7yW LagQjNpM78UMQkwk0Rbl9Es7bgz9TgItgFdGc5YL2sMNt/2QIgxV02NFOVKKfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706822765; 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=JCS/vocxEo5sQ9yJtKVW5KpaXpNMU0zbbcljCCKWQDM=; b=LiwYqpUiK9wUHymbQLc9ClYNTjTfs8F6kfINrPfUf/3ajcHonp6ioOx0Yu7Xp9Z2lpXv2H zNnrKRwsr3AbSNgv59l8bQ1AdNXd2+WOTXpjW9CegaVamsEkETIeZgWsPNJicl3IDxTG7H pw3JTNLbNsfrrKeht6gn5YvLBXiDsq13721cduxj7ThlmJL+Pw7HKrJxrU7shj74d3lNf1 8PNJhRLf+E8oJpTqEgg5otKaaz5ZUsprCNeDAwcMfXidKjgChMnDx6mzyX9p6kE/cDABuK zT4+Izjiaf4Si3v6ZCU6F91qzz8WBtKkshOciVRIihwZS4gUH+0r/zvNHON+TA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706822765; a=rsa-sha256; cv=none; b=gJ/qsbvsrilR2/KrdyuuWjvQoLjEQhTP9W1r3wTcqpzAfvE2zRMaZ7R27q9/J5EeYb+IG6 FWhtTAuNtmquT9iIJc3Xp9pIjH1sWiIKDIdRO/HYsmLnsUbWfyUVQRarj86XUZG87aIU5N ZI/Rc7nNkxJlQ5Na++jSOrB6XXEteqQDkWAZRN1t0Khu867FMuRqDsEvrxJZtNzCjzCb6g c6C1Lk8p8E0uG3R9BzkGWJs0khyoO6BGLg2dm8/aUDXhgNIeEwVzi0ey8XFTX964Soflez z8NhQPUM4IdsA45eDpUnC2cQLIgnwMM+bRaeFmQePqIwAHPLcKR9Xkah0h3PKw== 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 4TQsQj0R88z1J4q; Thu, 1 Feb 2024 21:26:05 +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 411LQ5uV070338; Thu, 1 Feb 2024 21:26:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 411LQ4gA070335; Thu, 1 Feb 2024 21:26:04 GMT (envelope-from git) Date: Thu, 1 Feb 2024 21:26:04 GMT Message-Id: <202402012126.411LQ4gA070335@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 16e02df98ad6 - stable/13 - setclassumask(): Accept 'inherit' as a value List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 16e02df98ad64753fed6ab73c1d1c2aa857b6394 Auto-Submitted: auto-generated The branch stable/13 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=16e02df98ad64753fed6ab73c1d1c2aa857b6394 commit 16e02df98ad64753fed6ab73c1d1c2aa857b6394 Author: Olivier Certner AuthorDate: 2023-06-20 19:41:04 +0000 Commit: Olivier Certner CommitDate: 2024-02-01 21:23:11 +0000 setclassumask(): Accept 'inherit' as a value 'inherit' explicitly indicates that the umask should not be changed. Reviewed by: emaste Approved by: emaste (mentor) MFC after: 3 days Relnotes: yes Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40687 (cherry picked from commit c328e6c6ccaa4cdf921c16d68a2f2c5992dd3b72) Approved by: markj (mentor) --- lib/libutil/login_class.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/lib/libutil/login_class.c b/lib/libutil/login_class.c index 69230db32961..e6485afade43 100644 --- a/lib/libutil/login_class.c +++ b/lib/libutil/login_class.c @@ -381,6 +381,11 @@ setclasscontext(const char *classname, unsigned int flags) } +static const char * const inherit_enum[] = { + "inherit", + NULL +}; + /* * Private function setting umask from the login class. */ @@ -392,7 +397,13 @@ setclassumask(login_cap_t *lc, const struct passwd *pwd) * 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); + rlim_t val; + + /* If value is "inherit", nothing to change. */ + if (login_getcapenum(lc, "umask", inherit_enum) == 0) + return; + + val = login_getcapnum(lc, "umask", def_val, err_val); if (val != def_val) { if (val < 0 || val > UINT16_MAX) {