From nobody Tue Jun 9 20:26:23 2026 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 4gZgRM5sQDz6gbYS for ; Tue, 09 Jun 2026 20:26:23 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gZgRM2hCTz40yD for ; Tue, 09 Jun 2026 20:26:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781036783; 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=xRp0WtzHfzlFrsfc/dH8FcKZM5B/8NiicWSGismTh+c=; b=mvt6z6i/RD/XHNDQYq9MouIfSlPWLpF2XsnK/sUu7ehLm5oe0E4Nubf2HZovJAJDo57TIX wfESMrlghdADpdn89/ZvI4cnxII7mPTe7iGQY/bXbdoBxk08I80KX8vobeqM/fmJ/Pi0fx zE8aBYtHt3zrHURDfOSlLc5UsK6oNx1q6fOKYHRn2TpLcTG6qoWxsZt8wsazsXtnVIpNCi mQvPfxqGTtgzrYmqSPVHHX6lA6XoHXCcFsqsWiheVI5v0MH/dmzt5IRWq34gU6ojh1sQGQ FDZhtP7f2lMMnQgrSQ+sqsYiHHq2BQ2d7RgsFJmd1aVQjWXzFlMPj3LaaKjXSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781036783; a=rsa-sha256; cv=none; b=pQO1NvrRFedPCJN4iogcINHYriNT2sFcHgV8Av0Ilra/TK08aXluDH9kgy3SRifOxRYs/P s/o9MV3R4LBtlKHNhw7blt1VP5AytCfZ+pSEaqgMnRHRZhML8XBz9q3+kuUkzofkENvK3h 1eoKKXZKtG3ty/xZC2NzFQv77hydng3ArTnZnH456T1tcVkFvP2WtHmA/p8KYMFhXLQUIA j0kvehqaFWvsh7bm2u2Gx+6W3Toe02fDB5VGBs8wntmp3zTcSODqB24+Wwa84/ccO36Fyf fq3TyX2hjrt137JDqJ0PFAzOK0F4yZENCcAEGxZIrBwFECcFgNWARiO4nB53sA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781036783; 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=xRp0WtzHfzlFrsfc/dH8FcKZM5B/8NiicWSGismTh+c=; b=jy9Rs9Sbk5EfSTaAP/stAFcR64BoZK3pmfTirn4imV+f+lh3nlHM0jXTTMStPnvyVJVybx JfImknz5CST0jNePIC4AJLONYBrJDESngluc46716CCLJeGZV3EBNIpJdrnePe6SzNoSYq 7BIo5jihJhj3VRfLSiyZYdkXhfrrFONfIS7uzHkX+JtB2QefPKDtZinOL+KzwVmIDjt1EI 4rBb2aROEdBa9QLPepF0CjJK3IkC0mW22G4Lat6XxWso/LP7pNrB+dhayHcxkqeTfErTL9 Jaak/HQodxBgfHVZm6HEFmDs46s72GYhZ0nFn1xGdApkHehP75x2ekg14FBSDw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gZgRM2FFPzqkc for ; Tue, 09 Jun 2026 20:26:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f4b2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 09 Jun 2026 20:26:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 8451c8ad420d - stable/15 - MAC/do: Clarify comments about flags attached per-ID or per-ID-type 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/15 X-Git-Reftype: branch X-Git-Commit: 8451c8ad420d312dd58a55f09fa1fc78f636cd8f Auto-Submitted: auto-generated Date: Tue, 09 Jun 2026 20:26:23 +0000 Message-Id: <6a2876ef.1f4b2.59f756a4@gitrepo.freebsd.org> The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=8451c8ad420d312dd58a55f09fa1fc78f636cd8f commit 8451c8ad420d312dd58a55f09fa1fc78f636cd8f Author: Olivier Certner AuthorDate: 2026-06-04 10:01:23 +0000 Commit: Olivier Certner CommitDate: 2026-06-09 20:25:52 +0000 MAC/do: Clarify comments about flags attached per-ID or per-ID-type No functional change. MFC after: 3 days Sponsored by: The FreeBSD Foundation (cherry picked from commit 0c2d64ce3da9c042da133c8b6d7391abb177f2c9) --- sys/security/mac_do/mac_do.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/security/mac_do/mac_do.c b/sys/security/mac_do/mac_do.c index ba49da22ce67..790701e57e56 100644 --- a/sys/security/mac_do/mac_do.c +++ b/sys/security/mac_do/mac_do.c @@ -89,20 +89,22 @@ _Static_assert(sizeof(uid_t) == sizeof(u_int) && (uid_t)-1 >= 0 && * encoding for simplicity. * * There is currently room for "only" 16 bits. As these flags are purely - * internal, they can be renumbered and/or their type changed as needed. + * internal, they can be renumbered and/or the underlying type changed as + * needed. * * See also the check_*() functions below. */ typedef uint16_t flags_t; -/* (i,gid) Specification concerns primary groups. */ +/* (i,gid) Group can appear as a primary group. */ #define MDF_PRIMARY (1u << 0) -/* (i,gid) Specification concerns supplementary groups. */ +/* (i,gid) Group can appear as a supplementary group. */ #define MDF_SUPP_ALLOW (1u << 1) /* (i,gid) Group must appear as a supplementary group. */ #define MDF_SUPP_MUST (1u << 2) /* (i,gid) Group must not appear as a supplementary group. */ #define MDF_SUPP_DONT (1u << 3) +/* (i,gid) Mask to detect a supplementary group specification. */ #define MDF_SUPP_MASK (MDF_SUPP_ALLOW | MDF_SUPP_MUST | MDF_SUPP_DONT) #define MDF_ID_MASK (MDF_PRIMARY | MDF_SUPP_MASK) @@ -110,8 +112,8 @@ typedef uint16_t flags_t; * (t) All IDs allowed. * * For GIDs, MDF_ANY only concerns primary groups. The MDF_PRIMARY and - * MDF_SUPP_* flags never apply to MDF_ANY, but can be present if MDF_CURRENT is - * present also, as usual. + * MDF_SUPP_* flags do not apply to MDF_ANY, but can be present if MDF_CURRENT + * is present also, as for explicit IDs. */ #define MDF_ANY (1u << 8) /* (t) Current IDs allowed. */