From nobody Thu Feb 1 21:31: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 4TQsXf0sS1z58j06; Thu, 1 Feb 2024 21:31:14 +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 4TQsXd563cz4bbd; Thu, 1 Feb 2024 21:31:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706823073; 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=wqsMNkX08sd3qpAESuQcDTDi0VwD763W4lmLgUG6mIA=; b=Mw7JKNjCTmc1vMu7GCw6OyT76UwhP+HWlGMo/dm3fqA8u9cgTO9FeGhROjxuAh7NIm1EMG VNdyQFAeJZkCYPQnirH4+ayHrs414pW1wuZ2YIWf4l6LSSnaMUN7VK5MhnSNuFiMR+sV8U 72RL0y2rLUHWJOLg30U7M3/ZGDYx3jckkayRlb3zNTtbY22SeW3O2oXAqD0Gts2XnMy8Xt GK5tpF5xxwosSqzGuiM3us6HrdfGDh9GaTIPV+Py9ssVsaZe8BUgsH6WocE9Rsir/uRJIF 1m0W0sM3iM1cH9oKdrpqlTK6bDBAMHb2yx4yBFre+MAFasbMj0Dse4IbJvV41A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706823073; 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=wqsMNkX08sd3qpAESuQcDTDi0VwD763W4lmLgUG6mIA=; b=slwd8JVmD+DyF/BKTPzv5EJLc2dfUqgLccrALtZAJZQ9gBTgmfvH/yMx6+J9C3UgyltNsr pKtgpQX61eOf+gAPlvWuK5kVjqG/+uvJvdDm8r/bkxCXCCU8XHzn0qnTLapXUz8kMmhcJr IcfkoLHXn1xB3Wh4fIPw2t0SNXc6/OSqp6wmyp06Vt3wO31TzWC5HeZY/H5eTeoTW31hDa pqF9geg/S8VfKYUacXKLduMiSylpGTw2r3Q4rSivQqZRYwaDcGx3n1Eztni1mPRwGRhy3m C9zKnc4aWCO/iBZosFQcJiyFvN/8g/ZiJ30gcsfsgTUXrmPK8b8beDL/hW+Mkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706823073; a=rsa-sha256; cv=none; b=NokWvG7Li5OgQwLN5geY4qkCp22uZas0F02bCK9BSorFS3q3nM1+QHvQH+L2isbBwAQ7tf BoThVACM8LRqNs/7e06Wh/f1W8U5SIC7CIcBESDUmyT+RQan7dqb9BxOAdArEDSMYCPF7W +zp2eECiaI0xdB3H2uhILWJ3T1jTpu3YeXGbmbNOEBTy8jteMV/WGExGHsFk7Bwv8azzeZ lDx4jeEvSncsHSjn2M4MJeBeF6ZZKRnqk9QQzQkzX2DcG6+No0P2DzW7TurNi3aN9dUxjC Zl5WuKdm98hpe4JMP7PnO5ezunKmMvI4sydf36G1UTPU3F7Sk2djRC+yWN0xAg== 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 4TQsXd4CTcz1HMQ; Thu, 1 Feb 2024 21:31: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 411LVDWi080653; Thu, 1 Feb 2024 21:31:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 411LVDCr080650; Thu, 1 Feb 2024 21:31:13 GMT (envelope-from git) Date: Thu, 1 Feb 2024 21:31:13 GMT Message-Id: <202402012131.411LVDCr080650@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: 83ac32d9a0f8 - stable/14 - setlogincontext(): Comply to style(9) 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/14 X-Git-Reftype: branch X-Git-Commit: 83ac32d9a0f81ccf89f708d159e6d060b53d5a32 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=83ac32d9a0f81ccf89f708d159e6d060b53d5a32 commit 83ac32d9a0f81ccf89f708d159e6d060b53d5a32 Author: Olivier Certner AuthorDate: 2023-05-25 14:29:22 +0000 Commit: Olivier Certner CommitDate: 2024-02-01 21:29:17 +0000 setlogincontext(): Comply to style(9) Remove indentation by inverting the big 'if (lc)' and using 'return'. Use explicit binary operators to produce booleans. Reviewed by: emaste, kib, dchagin Approved by: emaste (mentor) MFC after: 3 days Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40346 (cherry picked from commit 771d5c93ab5a3fb1701d9706df2ce87d6a9da6f3) Approved by: markj (mentor) --- lib/libutil/login_class.c | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/lib/libutil/login_class.c b/lib/libutil/login_class.c index e6485afade43..33a2189277ca 100644 --- a/lib/libutil/login_class.c +++ b/lib/libutil/login_class.c @@ -431,23 +431,28 @@ setclassumask(login_cap_t *lc, const struct passwd *pwd) static void setlogincontext(login_cap_t *lc, const struct passwd *pwd, unsigned long flags) { - if (lc) { - /* Set resources */ - if (flags & LOGIN_SETRESOURCES) - setclassresources(lc); - /* See if there's a umask override */ - if (flags & LOGIN_SETUMASK) - setclassumask(lc, pwd); - /* Set paths */ - if (flags & LOGIN_SETPATH) - setclassenvironment(lc, pwd, 1); - /* Set environment */ - if (flags & LOGIN_SETENV) - setclassenvironment(lc, pwd, 0); - /* Set cpu affinity */ - if (flags & LOGIN_SETCPUMASK) - setclasscpumask(lc); - } + if (lc == NULL) + return; + + /* Set resources. */ + if ((flags & LOGIN_SETRESOURCES) != 0) + setclassresources(lc); + + /* See if there's a umask override. */ + if ((flags & LOGIN_SETUMASK) != 0) + setclassumask(lc, pwd); + + /* Set paths. */ + if ((flags & LOGIN_SETPATH) != 0) + setclassenvironment(lc, pwd, 1); + + /* Set environment. */ + if ((flags & LOGIN_SETENV) != 0) + setclassenvironment(lc, pwd, 0); + + /* Set cpu affinity. */ + if ((flags & LOGIN_SETCPUMASK) != 0) + setclasscpumask(lc); }