From nobody Mon Jan 29 22:32:12 2024 X-Original-To: dev-commits-src-all@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 4TP32N5gQsz57Z0g; Mon, 29 Jan 2024 22:32:12 +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 4TP32N1rJZz4g7G; Mon, 29 Jan 2024 22:32:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706567532; 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=LERaRLaMFEzpvJUmPFiU/vpxa8R782bbksimimmBfPg=; b=vNjvt8XwoDIq0pSflWnsD/gEgce3Dbadcj6O9InWJX6+W0P5gzyzgUcaIW8VDDGQ0FeUSs yAtFl0BLhgP2Gja1d9fvegXjZ69Yh+ouljbkMbxG4aLBEpUt9/4Ugw2eOdy6P7h/epdxuL f7UEhvMXzsv2r7jZ+44S3NH3WTsdjSHAKyZtSr9g3T7Bi0bOQWuDBKMENSIRXREUDGe6a4 VPxN4VYIDoKvgDQxUPSPFBuWN6JZtaEWCRFumo8NXvyh9hEtN8FdVPdRyctrOVHLa7nV0Y cPffHwZrndpLAQZQJyYkNPdKXcYFsdNuzam+y9rF0xJZdgzFNhTtNCjL3NgY0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706567532; 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=LERaRLaMFEzpvJUmPFiU/vpxa8R782bbksimimmBfPg=; b=iZHQeV8VfW6+L2L16muHAh78BclRSp1pKT12nrkPojwAUfek1yGmkcrfzUXKbhrF5CmN6t R+xbbAVN5gSpO6/gDosGm4/QmOaF5Mpq0fNiGycJP88KZKNoi2PnqO5jMt7oXveF1HSRqc PZLQ7LaY58lTmFYPoF0/I4nOPtzXrRyD/RvSzgc5LSAZrSshMY+klIOfGmmTnVSkD/n1Qo tsHhEIGP1dLljKSj5kL9fZoiN+4ysMVkso+TQqUvyhqQ/7LJUP0gxuKOYt9cJnBu9JDiBd 2WpRKpKDTCtb+uvUTcVyeMRaJjaOkQsndmm+Q2M9pi/3WR5eWbib2AXt0hOGqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706567532; a=rsa-sha256; cv=none; b=x33dOcKWDzXDk+D/ljcIVzWt1sawtT5b7aBx6MYnIL4bKmA5O7IT441WPwiogOFP0hTtTu PyugM1lr+f+CVljiE1jEpolqI5mfJ/ynuoted85MFw3rQsscWe3Uq50JLHBuGl2o4MCnjP 8o+4jj+gYAY8wrBlY34Z0jeaqAH+8EzuoPd9VQ21A2a4HOikf0xxYI2E/Xx78OaIsvEHlr Ier7KmmRFEfiPEIqYVsJixmuGOsPa0I/6dzWSZKkpMy0rzFqXAadaQu62NTZ+ggf5v2LqC YBbkeRt6JRS58jXjMhRuA+u+NkO1dHabKb50qidodkHjrKL4bM7fRI2wFcPZ9g== 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 4TP32N0xL1z190R; Mon, 29 Jan 2024 22:32:12 +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 40TMWCm0013507; Mon, 29 Jan 2024 22:32:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TMWCGC013504; Mon, 29 Jan 2024 22:32:12 GMT (envelope-from git) Date: Mon, 29 Jan 2024 22:32:12 GMT Message-Id: <202401292232.40TMWCGC013504@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: 771d5c93ab5a - main - setlogincontext(): Comply to style(9) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 771d5c93ab5a3fb1701d9706df2ce87d6a9da6f3 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=771d5c93ab5a3fb1701d9706df2ce87d6a9da6f3 commit 771d5c93ab5a3fb1701d9706df2ce87d6a9da6f3 Author: Olivier Certner AuthorDate: 2023-05-25 14:29:22 +0000 Commit: Olivier Certner CommitDate: 2024-01-29 21:58:07 +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 --- 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 933d9bc4fe1f..ee0cec3423f5 100644 --- a/lib/libutil/login_class.c +++ b/lib/libutil/login_class.c @@ -430,23 +430,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); }