From nobody Wed Jun 05 09:03:06 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 4VvM1k2KjJz5MDWf; Wed, 05 Jun 2024 09:03:06 +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 4VvM1k1gz3z4Nl6; Wed, 5 Jun 2024 09:03:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717578186; 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=5iYaWlF49jYycTyJTwl8vvKJCdtqYycZ5FN2r5593/A=; b=yk04Qwi0NwWcyPOiRU2oUMreJubj9/aso3MOLVCsDqrrzrowNHc85v9zupdm0I6ja/+mV1 RuTOPuVbMhQBDE4IXwlaHYOq/ggbHCE6s+Ig2TPKgnSBjnuASSLnX8+UtFY0wEHcN63Hjt fRpgmohqf9KdxZp7iP7eOeelW3Jl1/eHagnKINivzuOQWorSjKHCxSSaarbOpaz49ehB7p 2R3KUWMgsTeiMnauQg0KIrTmC7/o+8QXBdgGOcl/52lPSLxB8vKo0bTR2b2vdhxwecaXtK 1Qa43JSW0buToMVatKu26/ousoZVLF4AxaQWLbDLHO1Wh71UWq/3xd97cFmgLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717578186; a=rsa-sha256; cv=none; b=Tuaz6NU6Bgt4wPusKfblJgYfRp366QGHtwbVrLwGYRuqhaRQh/c7tXaTlz6SWwJqB9StEy Y8oOWKYDYUyoWxXwjjSpsdj7x/jdV0W0hRXtCVvuW/7H89bmWodlpSnXJu9eaEOvT+MNBK x06rDzxarM9klu2ishEN7MBGWt/3DImx+MMYCgMpiQs0+rVpiz8a1aQZlViqOmW2zJpL+P kwH2OOGn+YcxEPy2LVNDVSEnHuz26QanRuEpBbMEy4VhSiWWX2fgBUf0zbgDOIer6p1Dw7 qjX55wXaxstUqbtfqiV88mK1U88zcq4tsKoQ/UFOs39fiWo6kQvml1cqVdJbNQ== 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=1717578186; 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=5iYaWlF49jYycTyJTwl8vvKJCdtqYycZ5FN2r5593/A=; b=DR3yhKbrERCP1NLAVP1ZkTJywiSsmi07N8Auuf7daMJw8N53C6LzGWYWHlq6iezC+LP0h9 XFn+dTM4E97iqR2ce1uW6JLQdtfJFQw6IN73XCubQha8ikmNXRjrcJ6T451FbBGM44uIG4 aLoFxSoymyjrKkCTFNWxly2ocDDX4cqlwkUr1Erw9wKUl++zNrIBeLLy9fHYnmyDxsc3a0 iIe2gD5+UbCzxfUJt2MV3C6iNanUavhlfGBIZWzjMo2+Z4p43jUx1UvZEd7wDJWwmtPWxC SKs3N/uH9tUh8gVo78oGF25UeCggJ2OsKk7aJJZ4S29E+y3bZgwgZAbLVN57Cg== 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 4VvM1k1GkJzwKx; Wed, 5 Jun 2024 09:03:06 +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 4559366d093352; Wed, 5 Jun 2024 09:03:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 455936kc093349; Wed, 5 Jun 2024 09:03:06 GMT (envelope-from git) Date: Wed, 5 Jun 2024 09:03:06 GMT Message-Id: <202406050903.455936kc093349@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 83fcab792c9d - main - nuageinit: use pw(8) instead of getent(1) 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 83fcab792c9d7f13f7e8bd73cf1850ba74f49341 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=83fcab792c9d7f13f7e8bd73cf1850ba74f49341 commit 83fcab792c9d7f13f7e8bd73cf1850ba74f49341 Author: Baptiste Daroussin AuthorDate: 2024-06-05 08:34:25 +0000 Commit: Baptiste Daroussin CommitDate: 2024-06-05 09:00:53 +0000 nuageinit: use pw(8) instead of getent(1) pw(8) allows to seek for users in a custom rootdir, which makes it easier for a testsuite MFC After: 3 days --- libexec/nuageinit/nuage.lua | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index 55486ae2b122..020b54b0776c 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -72,7 +72,12 @@ local function adduser(pwd) warnmsg("Argument should be a table") return nil end - local f = io.popen("getent passwd "..pwd.name) + local root = os.getenv("NUAGE_FAKE_ROOTDIR") + local cmd = "pw " + if root then + cmd = cmd .. "-R " .. root .. " " + end + local f = io.popen(cmd .. " usershow " ..pwd.name .. " -7 2>/dev/null") local pwdstr = f:read("*a") f:close() if pwdstr:len() ~= 0 then @@ -109,8 +114,7 @@ local function adduser(pwd) precmd = "echo "..pwd.plain_text_passwd .. "| " postcmd = " -H 0 " end - local root = os.getenv("NUAGE_FAKE_ROOTDIR") - local cmd = precmd .. "pw " + cmd = precmd .. "pw " if root then cmd = cmd .. "-R " .. root .. " " end @@ -140,7 +144,12 @@ local function addgroup(grp) warnmsg("Argument should be a table") return false end - local f = io.popen("getent group "..grp.name) + local root = os.getenv("NUAGE_FAKE_ROOTDIR") + local cmd = "pw " + if root then + cmd = cmd .. "-R " .. root .. " " + end + local f = io.popen(cmd .. " groupshow " ..grp.name .. " 2>/dev/null") local grpstr = f:read("*a") f:close() if grpstr:len() ~= 0 then @@ -151,8 +160,7 @@ local function addgroup(grp) local list = splitlist(grp.members) extraargs = " -M " .. table.concat(list, ',') end - local root = os.getenv("NUAGE_FAKE_ROOTDIR") - local cmd = "pw " + cmd = "pw " if root then cmd = cmd .. "-R " .. root .. " " end