From nobody Mon Nov 24 20:31:40 2025 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 4dFctN21pKz6HnPv for ; Mon, 24 Nov 2025 20:31:40 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dFctN13QFz3Wxs for ; Mon, 24 Nov 2025 20:31:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764016300; 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=/luGaQ0po2GnLoaihNbgcC+fS3pPgVJQ16doDBae0aw=; b=wNc0tkN3vzWiU5EH11WwL9IxuZNlpcexZjYRsGllciDwOI11hUuIDC7jAlCMfYPSo9LvEB 67bh1NcBKOCvMuEymTD122HNdd+zhCWSj6amjtr9RF8Grj558ELCiYZEahz5eF0hs6jBZU B+kcasQiJelLBb6JrV0tfobaWtsO4ShKrlMcp5/8F7MneuL9zKsFp7Fua8zl1G9/Gq7W8C X+pe3Os4vQBatbEb7MeKozdYks8JXXw7GsXCZ3sgsB0NOwbk4pSJqsJKi12rnxIHzo1+KT Ne6EO1idocOrPGH9eWTdQPV3haM8LAldtCI5KIFbt6pGudkJ+g5bMLaR0wsmww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764016300; 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=/luGaQ0po2GnLoaihNbgcC+fS3pPgVJQ16doDBae0aw=; b=P3NeRMKYKi+H/227B0DG2boAVJR2aUH5RyLXtRtDeHK0tK2W6d/A92960dVR0pmz6ttox5 6QLeP0A3RcbHR3N9U42XM0n5WpRD/Zds13IrPZpOepuwWMgZxIXukkzAThHsuBvtSnaf6U J/+zaweaYwWqKkBbcBoALmDiOM6qWv6RTrD5FK2wsRZRoQ8eytW51HYMXTS0963GVRkx10 onByZenOHwEXOeiwH388GOP5gYoHQ23BXr0+SDT08qndNOhAIzQIf/OYkp4tzcw1g2YxEf WVZrFeHcXPR5kuAMvAHwFS0fiwy5B9wQYGOIRlbVoVITt6r2pO9SFsJ6uU+2FA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764016300; a=rsa-sha256; cv=none; b=gvPpHYsLd1eysr0PU5brnvT3IqB3+AnVgZrcxkoLYlATaJXuqP8wgqwcR0jwUUdRRxl1pb 7EurMYBpv4BFEmzHxw3GtKomejW6I84o/OunbaJzSR+lJ/VB1xXC6DxJvTRWUjPT6KOHej iXUtZ5YGxzlS/MVsMhobXF2iEIJgKwMUIjN/4aw8NszwjzIkZnKxNKGLwnuCOtaNOt0fpK PVDw56lqVkMNzKWYJA2koetC0b8+1eeN1IM0fnorNIbEe29INMkTfkJfhCCMMSNML9FoqR 1igcwglFWK/jdlJ5yDGVBByoxC4Wy53CTmwplDCrE9iz3L5Y3Peh2+z2mlBKdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dFctN0c6pzTwG for ; Mon, 24 Nov 2025 20:31:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 28e66 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 24 Nov 2025 20:31:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: b92b1b475830 - main - mdo(1): Avoid calling getgroups() in some unnecessary cases 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: b92b1b47583036bd02e656564ff22c92b8949077 Auto-Submitted: auto-generated Date: Mon, 24 Nov 2025 20:31:40 +0000 Message-Id: <6924c0ac.28e66.58c10bc5@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=b92b1b47583036bd02e656564ff22c92b8949077 commit b92b1b47583036bd02e656564ff22c92b8949077 Author: Olivier Certner AuthorDate: 2025-11-14 11:59:09 +0000 Commit: Olivier Certner CommitDate: 2025-11-24 20:31:00 +0000 mdo(1): Avoid calling getgroups() in some unnecessary cases If the basis for supplementary groups are the current ones, we do not need to fetch them when they are to be replaced entirely (which we already have been doing), as in the '!start_from_current_groups' case, but specifically also when they are not going to be touched at all. This change in passing makes the modified code block's comment saying that SETCREDF_SUPP_GROUPS need not be set here correct. MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53771 --- usr.bin/mdo/mdo.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/usr.bin/mdo/mdo.c b/usr.bin/mdo/mdo.c index 3eb5d4e5c23f..879423bc0128 100644 --- a/usr.bin/mdo/mdo.c +++ b/usr.bin/mdo/mdo.c @@ -753,8 +753,14 @@ main(int argc, char **argv) */ setcred_flags |= SETCREDF_SUPP_GROUPS; } - } else if (supp_groups_str == NULL && (supp_mod_str == NULL || - supp_mod_str[0] != '@')) { + } else if (supp_groups_str == NULL && supp_mod_str != NULL && + supp_mod_str[0] != '@') { + /* + * We do not need to determine the current groups if, as for the + * '!start_from_current_groups' case, we are going to replace + * them entirely, but here also if we do not amend them at all + * (because they are by definition already in place). + */ const int ngroups = getgroups(0, NULL); if (ngroups > 0) {