DIED => 5,
REJ => 10,
};
-# These constants are changed by ex/makevm
-use constant USER => 65534;
-use constant GROUP => 65534;
use BSD::Resource qw/setrlimit RLIMIT_AS RLIMIT_FSIZE RLIMIT_NPROC/;
use IPC::Signal qw/sig_name sig_num/;
my $killuser = $ENV{GRUNTMASTER_KILL_USER};
my @sudo;
-@sudo = (shellwords ($ENV{GRUNTMASTER_SUDO}), '--') if $ENV{GRUNTMASTER_SUDO};
-$mlimit = 1_000_000_000 if @sudo; # sudo wants a lot of address space
+@sudo = (shellwords ($ENV{GRUNTMASTER_SUDO}), '--') if $ENV{GRUNTMASTER_SUDO} && $nobody;
+undef $mlimit if @sudo; # sudo wants a lot of address space
my $ret = fork // die 'Cannot fork';
if ($ret) {
}
$tle = 1
};
- alarm ($timeout || 5);
+ alarm ($timeout || 10);
waitpid $ret, 0;
alarm 0;
if (@sudo) {
$? = $? >> 8;
- $? = $? < 128 ? ($? << 8) : $? - 128;
+ $? = $? < 128 || $? > 128+32 ? ($? << 8) : $? - 128;
}
my $sig = $? & 127;
my $signame = sig_name $sig;
POSIX::close $oldfd or die $!;
}
}
- my $nproc = $killuser ? 5 : 1;
+ my $nproc = $killuser ? 15 : 1;
+ my $debug = $ENV{TEST_VERBOSE};
%ENV = (ONLINE_JUDGE => 1, PATH => $ENV{PATH}, HOME => $ENV{HOME});
setrlimit RLIMIT_AS, $mlimit, $mlimit or die $! if $mlimit;
setrlimit RLIMIT_FSIZE, $olimit, $olimit or die $! if $olimit;
setrlimit RLIMIT_NPROC, $nproc, $nproc or die $! if $nobody;
- POSIX::setgid $nobody ? 65534 : USER;
- POSIX::setuid $nobody ? 65534 : GROUP;
- unshift @ARGV, @sudo if $nobody;
+ unshift @ARGV, @sudo;
+ say STDERR "Executing: ", join ' ', map { "'$_'" } @ARGV if $debug;
exec @ARGV;
}