* Add wrappergroup config option, which can be used to cause wrappers

  to be created owned by some group other than the default. Useful
  then there's a shared repository with access controlled by a group,
  to let ikiwiki run setgid to that group.
* ikiwiki-mass-rebuild: Run build with the user in all their groups.

1 files changed, 19 insertions, 2 deletions

diff --git a/ikiwiki-mass-rebuild b/ikiwiki-mass-rebuild
index 1ec90b3c0..710db4eac 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,11 +33,15 @@ 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") {
+		if ($< != $uuid || $> != $uuid || $( != $ugid) {
 			die "failed to drop permissions to $user";
 		}
 		%ENV=(