X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=blobdiff_plain;f=ikiwiki-mass-rebuild;h=8cc6f45c1d9f6fbd21b40e403bc3d5561bb93d3e;hp=5b6a90b9087d4ffdc841c1ed9f10143b1cbddc70;hb=267885009f616e909d2d326ca8985677a2f395a3;hpb=c9983bc7d8855f4d7dfb09c99491576beb8168ae

diff --git a/ikiwiki-mass-rebuild b/ikiwiki-mass-rebuild
index 5b6a90b90..8cc6f45c1 100755
--- a/ikiwiki-mass-rebuild
+++ b/ikiwiki-mass-rebuild
@@ -2,6 +2,19 @@
 use warnings;
 use strict;
 
+sub supplemental_groups {
+	my $user=shift;
+
+	my @list;
+	while (my @fields=getgrent()) {
+		if (grep { $_ eq $user } split(' ', $fields[3])) {
+			push @list, $fields[2];
+		}
+	}
+
+	return @list;
+}
+
 sub processline {
 	my $user=shift;
 	my $setup=shift;
@@ -20,15 +33,21 @@ sub processline {
 	defined(my $pid = fork) or die "Can’t fork: $!";
 	if (! $pid) {
 		my ($uuid, $ugid) = (getpwnam($user))[2, 3];
-		$)="$ugid $ugid";
+		my $grouplist=join(" ", $ugid, $ugid, supplemental_groups($user));
+		$)=$grouplist;
+		if ($!) {
+			die "failed to set egid $grouplist: $!";
+		}
 		$(=$ugid;
-		$>=$uuid;
 		$<=$uuid;
-		if ($< != $uuid || $> != $uuid || $( != $ugid || $) ne "$ugid $ugid") {
+		$>=$uuid;
+		if ($< != $uuid || $> != $uuid || $( != $ugid) {
 			die "failed to drop permissions to $user";
 		}
-		%ENV=();
-		$ENV{HOME}=(getpwnam($user))[7];
+		%ENV=(
+			PATH => $ENV{PATH},
+			HOME => (getpwnam($user))[7],
+		);
 		exec("ikiwiki", "-setup", $setup, @ARGV);
 		die "failed to run ikiwiki: $!";
 	}