From nobody Thu Feb 1 21:26:07 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 4TQsQl4ffxz58hNw; Thu, 1 Feb 2024 21:26:07 +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 4TQsQl3cCyz4WN6; Thu, 1 Feb 2024 21:26:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706822767; 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=9nBw+/jFvecV8IcIm5IqaooND63LV7y8YSdGssr6PNU=; b=tMqfCrUwqnKiZXN9BuIStyC08UWrM2et603HoO9LMDRkjHKaEHiPxvvbhigyipsuhAzNXP hAYXXIvnOUZKun/NoxwxHzuy5kVdA5yuSjC6NzMaI+wrPmuZvNJFR4p7XcIVx8gWUB6EMe rBeAghPViKVXAC6AxBmP5OqKZzQOURR7hnmgoG7lKP5ZoKSJRe2Upywi/OF9qo7dFM1eQ8 fTBJYHm0xM/Sb4wk15LIVtPu1arkU+2s5ilD/KP1Pp7u1p01fe//2EGzHoVOh4jb0YCaSE 3jRc67c9aBohAgu43y803J/XuNoRBIEgZp4iRfLIb1r+Ki7F2CmnI25ooWSchw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706822767; 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=9nBw+/jFvecV8IcIm5IqaooND63LV7y8YSdGssr6PNU=; b=RQiawE1LR8epgXPPux3Ntvpk0KUuEmLmR9gFxA9V7eA45Rp0k9xZnVuLafy7pKyiv9QDuc /g5E31hm527fyi3cqCq4XPDS3Vai5eaHdF0Bd+CWz7fmJzqlovhj5i1SvqTcKlxK2D6R5U R9xJqeGdFww6kh0i6di08Yi49a1p4sNSd0mffv6hxOz/15lRMg5QYctAAuWjcnKstxaEMQ wOMYsS5hJCme+SkxmXUPazR14vLvvOrzDjMjpbRyY6poP+URMrsbzNFZYofcNnPkaV6hye WkZLEn8A6wGt+DZIK0YiyBf5V4S0Qy9u07+78/H0LEmwBaDIe+HBJcsX5/Cc6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706822767; a=rsa-sha256; cv=none; b=dtUWP/PmoPraMF+9C1xfqo3mi2ZepYlOkqt9b3aiSB1/xheXPx1DaOP2AWNKeDkRQQ+iKx xo7gL3tBY1xVf9r9qjDzHjgKkgH54t8cI82HPWxFoRyB3YuZJqedKJHMJaGFC2KSzQR04E DJq4tM+vsMnNZWCcVg2RGXdKcp++tWkPhnVQfqtf04uCIFCj92/AVj6PJgZE3pGbaLOSfZ Cngq7yjuUfkHGIT3SgWd4s20MSAP0TXo2g8ejlSg2REzwqzedpLBLjLDt3gSornxsGebSx RrPpTInADzAq80FUM1318zS3GsECN1LKWFYCRuOwUYoT2NjlqFA6XPX1ztkVkw== 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 4TQsQl2kCpz1HbQ; Thu, 1 Feb 2024 21:26:07 +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 411LQ7eF070423; Thu, 1 Feb 2024 21:26:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 411LQ7Ab070420; Thu, 1 Feb 2024 21:26:07 GMT (envelope-from git) Date: Thu, 1 Feb 2024 21:26:07 GMT Message-Id: <202402012126.411LQ7Ab070420@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: 6843f1c2ef08 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 6843f1c2ef08822dab352101decb69f9f6e1cae8 Auto-Submitted: auto-generated The branch stable/13 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=6843f1c2ef08822dab352101decb69f9f6e1cae8 commit 6843f1c2ef08822dab352101decb69f9f6e1cae8 Author: Olivier Certner AuthorDate: 2023-05-25 14:29:22 +0000 Commit: Olivier Certner CommitDate: 2024-02-01 21:23:23 +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); }