diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2022-06-13 15:45:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-13 15:45:09 +0200 |
| commit | 2fef24f528769d7fedd3275873b59956b13257d1 (patch) | |
| tree | 3994fdaf72f23dc7c67f45b04dc77d7811abbdc8 /src/libstore | |
| parent | 9a26a0147520bf381518e7d24ed84660cb003ca5 (diff) | |
| parent | 931930feb139e6db0d7c01097003f8e45862f68f (diff) | |
Merge pull request #6634 from lovesegfault/fix-getgrouplist
fix(libstore/lock): support users that belong to more than 10 groups
Diffstat (limited to 'src/libstore')
| -rw-r--r-- | src/libstore/lock.cc | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/src/libstore/lock.cc b/src/libstore/lock.cc index f1356fdca..fa718f55d 100644 --- a/src/libstore/lock.cc +++ b/src/libstore/lock.cc @@ -67,13 +67,26 @@ bool UserLock::findFreeUser() { #if __linux__ /* Get the list of supplementary groups of this build user. This is usually either empty or contains a group such as "kvm". */ - supplementaryGIDs.resize(10); - int ngroups = supplementaryGIDs.size(); - int err = getgrouplist(pw->pw_name, pw->pw_gid, - supplementaryGIDs.data(), &ngroups); + int ngroups = 32; // arbitrary initial guess + supplementaryGIDs.resize(ngroups); + + int err = getgrouplist(pw->pw_name, pw->pw_gid, supplementaryGIDs.data(), + &ngroups); + + // Our initial size of 32 wasn't sufficient, the correct size has + // been stored in ngroups, so we try again. + if (err == -1) { + supplementaryGIDs.resize(ngroups); + err = getgrouplist(pw->pw_name, pw->pw_gid, supplementaryGIDs.data(), + &ngroups); + } + + // If it failed once more, then something must be broken. if (err == -1) - throw Error("failed to get list of supplementary groups for '%1%'", pw->pw_name); + throw Error("failed to get list of supplementary groups for '%1%'", + pw->pw_name); + // Finally, trim back the GID list to its real size supplementaryGIDs.resize(ngroups); #endif |