From nobody Sun Jun 28 18:40: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 4gpJBJ36Rnz6jkVx for ; Sun, 28 Jun 2026 18:40:24 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBJ0GQMz3Xwc for ; Sun, 28 Jun 2026 18:40:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672024; 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=Hx5T5LAh3/b9OL6a5wddAP3RsMlbEeMqVDiAWUZXx7Q=; b=gMxa4r/NNJbg4Un5cvn6NWnG5iu7ZJNnnVpNH/tY5dp/6STk5NTVPtw223Xg0CZKV6GwOT ZBlFPUaL/R7y6RS2AJ0cjzE2wkh8OGGYkKBz3phVpjNWxiB/OUO/bqwYTw1J/CZf/5evHr Qnx6k4AgBg2+PjeMq8ueHKAS/Hz/W0jOOauUzMfIpZl3Yh/wNyxijq9GRCMOv0HZai5N6V niBlD0ji9uH/EdqEQtXswpwvcID59mUoAYFOIMr3xjCsYynCDvvWeWY0Yw27Sg22bHvHU1 rgaBwA5zSGYMT6f4Z16lE2kBYOepMyImSliAjiGpy92bSS6Cev7xiNtRSAdMYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672024; a=rsa-sha256; cv=none; b=jM3lEOCgRjZ57CfleIIsA62yMo388HZaj1J2eBsoTKG1ZG/a7RfsowITdatwrCZEqHZjCk QO0ZHL35wYvDvygVzbOB+7by0Xv2MutJBN1xkGhwM8ZKnw4vsCdt5x7yuYrJXOAK70rmS4 i4LU5KXzk5evE82DNPpzsAceNJZG0AjPgKMs+4QigLe/U9KJC6/nb6Pxu6kQETVnCK2Xqk AZv+ypzLaFMieKfAzyra6ln2RDRCSTMLO780+MdzAdu4glyeM2ENe1AaTugEbj03tG4Sg8 2RxL/CAk0143/iR2O7tv1IAooEIAaKQAc1+hx9FLzv+lPgOJXn4SyUlnd3yOUQ== 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=1782672024; 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=Hx5T5LAh3/b9OL6a5wddAP3RsMlbEeMqVDiAWUZXx7Q=; b=Y4rtkAABAMaZ/IpXOPokaNB6+52EKxLIX1oAeOcYe50/mU7vLmVWFTSozybrsxphK+Bgop kGAW6njpijuMJELclUSl1/osa7Cv+I1bCMP0gVHT1ZB3a58ZDj4K80vBdKtU7qdKP6KAuB VOqczH023pX9qBDDO8uNba5fprllZR7W9ycQei9Xr9qzdjp6Jk9qyPjZYTb0jhxbZ1gFT+ EfOTPLikEsz40B7yJ3+nLEnFGk/FP6tYtvzllgvYFRpe8VydreJPhxgxs4vv6BOSuTmyZz IQKDon/SnTfeNP88iJ8Ojf01kzIpqb95t48gKGg+sUiMf2M95S5uIBYlYBCavA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBH6QSZz7CF for ; Sun, 28 Jun 2026 18:40:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1cd40 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: f34a21ba0ada - stable/15 - nuageinit: remove dead checkgroup(), inline check in purge_group() 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f34a21ba0ada7ddfcce2ba382d2000f030ef21f5 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:23 +0000 Message-Id: <6a416a97.1cd40.789f38cd@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=f34a21ba0ada7ddfcce2ba382d2000f030ef21f5 commit f34a21ba0ada7ddfcce2ba382d2000f030ef21f5 Author: Baptiste Daroussin AuthorDate: 2026-06-04 18:32:48 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:32:24 +0000 nuageinit: remove dead checkgroup(), inline check in purge_group() Call getgroups() once instead of N times per call. Inline the membership check directly, removing the now-unused checkgroup() helper function. (cherry picked from commit 852504a5fa5eb6b4dea98bd7abdb89f1c7bab2b0) --- libexec/nuageinit/nuage.lua | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index a491ca8d9df6..c443d6711b14 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -200,23 +200,19 @@ local function getgroups() return splitlines(groups) end -local function checkgroup(group) - local groups = getgroups() - - for _, group2chk in ipairs(groups) do - if group == group2chk then - return true - end - end - - return false -end - local function purge_group(groups) + local existing = getgroups() local ret = {} for _, group in ipairs(groups) do - if checkgroup(group) then + local found = false + for _, eg in ipairs(existing) do + if group == eg then + found = true + break + end + end + if found then ret[#ret + 1] = group else warnmsg("ignoring non-existent group '" .. group .. "'")