From nobody Thu Jun 4 21:15:44 2026 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 4gWcmc5VFgz6gy06 for ; Thu, 04 Jun 2026 21:15:44 +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 4gWcmc2sL1z3LcY for ; Thu, 04 Jun 2026 21:15:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780607744; 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=z/pSCgTI5lju/qoyxTuZDLBV1cvnL1VVM6VhNAOrnEc=; b=MihV9zFsnMXMeslrX9PD6W2vZBPXsB4APksK5TgYwE5ZZTlZpODoIYVK7O0ScUSIS7g/cx 8qC0VKbOluSeiwvMNtUrWv07FcDfCozu4UNBFN/93MhdD1XUdVvV23fT6wCMtsR9+Gul47 vGOXvxkkLaoaNgepsi0uklAc2k2Ag5e2hNHt9VNyiiYLlM8jHWw+RTTIQLjyWLVUuht4IL nTFiTwvYgWPP/VmC8K/v+fC1lzxZS+tvUASfaYOK4brSXUBGGc35V4jVAmte+nTV5ajV9U eL8mT0G8/LjmzVqywPbM2KYzKvDXEhkoZybg1RP41K8Me8tu90Uc4l/tStddxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780607744; a=rsa-sha256; cv=none; b=RiPtC8dsz/DGHetMhW6rMxi4pEbtUaFpaYJ40QSiB/gv5zkNKoOwjceKt33s+aN+CkAgyT 6uo9H3abem0IMTcA8StDG7v7/Tqvd1T7EjCIgyA0IOUpvwAWpMklI6WHSI5lvy733G31vk 88LGDXtoT8oNTBHSl0THaeglXyAjzywMC2W3F2NdAt+DT39PLLscMrV8S8C18fwqge6LFq RLDIVH+xOtBR8ewlcVvVtBAW7UaDt9xd3LaXD7jSkgOwvlJ43uq6aLPAA/2LNTg1XPsTkC WyYnzTUQujjZZSh6lJw7AgHTJu7LFthodQcXel4097itrroxpGN2pMM1/NYhFQ== 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=1780607744; 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=z/pSCgTI5lju/qoyxTuZDLBV1cvnL1VVM6VhNAOrnEc=; b=TiOL1sRhY5nD7pEZBNl68JuSg9RCurfWfBmqRnmKhQ5zSQ8ixgH1cqg0W1zSaUPqVdZHIk 96ngPYWns5nzmM4mR186JtvxbztxEPZKdeNzGQu7Hf8PnSSMXT7NjSbUpO6PzbYBSbDyz9 6iJIVjRH2BzTBOmgYsHgO+77FOx04AnGBAX1ExgdFHBswic6ZnRyj9NnZf+MzCBz+jYdzW keKzhTrYcZX1RHEN8m3jnh56RgpRFim1c04PZuijkgJkkdFAaizGYvXuUa/loulOpq8d8T f57r8qkRisI+IRyMIMLW3MgU7OSsIapRB7UIz+pw2438COCyLhNlTOPfRdE/OQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gWcmc2Pdpz1F2Q for ; Thu, 04 Jun 2026 21:15:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c4da by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 04 Jun 2026 21:15:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 852504a5fa5e - main - nuageinit: remove dead checkgroup(), inline check in purge_group() 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 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/main X-Git-Reftype: branch X-Git-Commit: 852504a5fa5eb6b4dea98bd7abdb89f1c7bab2b0 Auto-Submitted: auto-generated Date: Thu, 04 Jun 2026 21:15:44 +0000 Message-Id: <6a21eb00.3c4da.9a3e700@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=852504a5fa5eb6b4dea98bd7abdb89f1c7bab2b0 commit 852504a5fa5eb6b4dea98bd7abdb89f1c7bab2b0 Author: Baptiste Daroussin AuthorDate: 2026-06-04 18:32:48 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-04 18:32:48 +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. --- 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 .. "'")