spawn/UidGid: rename groups to supplementary_groups

MaxKellermann · MaxKellermann · commit ad8f1590dcbe · 2025-03-11T13:56:36.000+01:00
diff --git a/libcommon b/libcommon
@@ -1 +1 @@
-Subproject commit e841bb244efbe880ccbb329c5768cd928fe83fc8
+Subproject commit a384beb417629373b468af8b51b178453c0153c2
diff --git a/src/Hook.cxx b/src/Hook.cxx
@@ -45,7 +45,7 @@ WorkshopSpawnHook::Verify(const PreparedChildProcess &p)
 			throw FmtRuntimeError("Wrong gid {}, expected {} for plan {}",
 					      p.uid_gid.gid, plan->gid, plan_name);
 
-		if (!CompareGroups(plan->groups, p.uid_gid.groups))
+		if (!CompareGroups(plan->groups, p.uid_gid.supplementary_groups))
 			throw FmtRuntimeError("Supplementary group mismatch for plan {}",
 					      plan_name);
 
diff --git a/src/workshop/Workplace.cxx b/src/workshop/Workplace.cxx
@@ -133,7 +133,7 @@ WorkshopWorkplace::Start(EventLoop &event_loop, const WorkshopJob &job,
 		p.uid_gid.gid = plan->gid;
 
 		std::copy(plan->groups.begin(), plan->groups.end(),
-			  p.uid_gid.groups.begin());
+			  p.uid_gid.supplementary_groups.begin());
 	}
 
 	if (!plan->chroot.empty())

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ WorkshopWorkplace::Start(EventLoop &event_loop, const WorkshopJob &job,`
`133`	`133`	`p.uid_gid.gid = plan->gid;`
`134`	`134`
`135`	`135`	`std::copy(plan->groups.begin(), plan->groups.end(),`
`136`		`- p.uid_gid.groups.begin());`
	`136`	`+ p.uid_gid.supplementary_groups.begin());`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`if (!plan->chroot.empty())`