From nobody Thu Feb 01 21:26:13 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 4TQsQs2lCkz58hKR; Thu, 1 Feb 2024 21:26:13 +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 4TQsQs1sjDz4WQx; Thu, 1 Feb 2024 21:26:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706822773; 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=YBU7LOLYfw9YEurZEFSbDMTIrNGPPnJ0XGhkFO3yfxk=; b=qgucTSW1oodwwjv8EuXKmvgSENQi80FECegBxnUalmu0clLzZvKrzVFou+G+ID1SEq96+p 604pMjneVvSARvXXd08/UhkzXtU48yBw8kcP6eYhGIf+SLxTBVoRKlY25Ytq4IPZKLlo60 QpxBDnHkGYofMeCfB3+yDMUu+pTL7Ue+h4Yxt90WqsKOION6837sldUkiEVfvHJhE0Qu3A kWkU0G6RilHag3nQD5qjC1i8C8OWO9lpEzcv5rQpyCbZbrHx63V+I9xLpmFB/iXTAvW8G7 i2uO6gALI43BcYXadspZu5Bcomk2SnWbPRQIzF5oozqcBQnYGdM+FSxVj+ySoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706822773; 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=YBU7LOLYfw9YEurZEFSbDMTIrNGPPnJ0XGhkFO3yfxk=; b=RDAS24fCD4BoYWfVs/8XcIa+u4hyx+wHDTydsE/MJnsdb7l9cof817/4FxUuUE5cXEbbgK bp+aN53ix0FLB0DUsuqb6TfF1xrP687E55V0FRqsbTNldVTOqPZZHVmNM0PQLgmwK+F78f qqcQgH9ouGjuw5v4L3vxY6nHDsFYib5D11PR/R9gIe4HXZUzfBF8Y7ZfeBLgcSjIROAxdC eLQpANoXsUSqJyVkD7heAc4MEgFPnjQZXEnxMpuLpOLRafXzL01LBV756RO8Rf8+gfQjI1 +6l/ci0vef30rT/J21xLwPWyR1i6T0SHloTI46LYsCTgTynVw2OT3r1Ld6qF2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706822773; a=rsa-sha256; cv=none; b=e1pJ9JrWBq4z+t3hByaBICXAjRnpDYElD6Rw4B+tlqHV/K5De2RzlPDoW1CQBXhMwoPGdZ HyW+qQRcoOs3mMgNTC9ggzlueMAzj93NFr4JFDNHUC162oo83JVtmrQeEB3da2L9MHins3 505yGafB2o/n4G1K+hK0DZeK61GhmcQGLgUReZqa086K1jIPq5CxmH0N5OCNdP47YIRblv u2r85pYjAICC/crW6dZXe7/5Sfw++VE+9EpAjnGOhiGCTKDKoWptQd8w6rsNtiHkl8Qbb+ DELh/H3y5MmgeVyYYhmUfQ4Powp43LVyGuburh5kGfcrfCKyLVN3Co83h60Ztw== 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 4TQsQs0jtKz1Hsj; Thu, 1 Feb 2024 21:26:13 +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 411LQDne070686; Thu, 1 Feb 2024 21:26:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 411LQDin070683; Thu, 1 Feb 2024 21:26:13 GMT (envelope-from git) Date: Thu, 1 Feb 2024 21:26:13 GMT Message-Id: <202402012126.411LQDin070683@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: e074746fec21 - stable/13 - setclasspriority(): New possible value 'inherit' 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: e074746fec21fbc4a66e936408e3b585f89b73bd Auto-Submitted: auto-generated The branch stable/13 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=e074746fec21fbc4a66e936408e3b585f89b73bd commit e074746fec21fbc4a66e936408e3b585f89b73bd Author: Olivier Certner AuthorDate: 2023-06-21 08:53:37 +0000 Commit: Olivier Certner CommitDate: 2024-02-01 21:23:59 +0000 setclasspriority(): New possible value 'inherit' It indicates to the login.conf machinery (setusercontext() / setclasscontext()) to leave priority alone, effectively inheriting it from the parent process. PR: 271749 Reviewed by: emaste, yuripv Approved by: emaste (mentor) MFC after: 3 days Relnotes: yes Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40690 (cherry picked from commit d162d7e2ad327ceada4102c5d6779f9ecd809502) Approved by: markj (mentor) --- lib/libutil/login_class.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/libutil/login_class.c b/lib/libutil/login_class.c index 9d8dc652d678..f545e3661520 100644 --- a/lib/libutil/login_class.c +++ b/lib/libutil/login_class.c @@ -463,9 +463,15 @@ static void setclasspriority(login_cap_t * const lc, struct passwd const * const pwd) { const rlim_t def_val = LOGIN_DEFPRI, err_val = INT64_MIN; - rlim_t p = login_getcapnum(lc, "priority", def_val, err_val); + rlim_t p; int rc; + /* If value is "inherit", nothing to change. */ + if (login_getcapenum(lc, "priority", inherit_enum) == 0) + return; + + p = login_getcapnum(lc, "priority", def_val, err_val); + if (p == err_val) { /* Invariant: 'lc' != NULL. */ syslog(LOG_WARNING,