Use sudo in VM

[gruntmaster-daemon.git] / gruntmaster-exec

diff --git a/gruntmaster-exec b/gruntmaster-exec
index bcde8d721321899e0f65cf317ecf8d3d697f4a7e..8ab857b2c469504182859214d6d2ab402489b5fc 100755 (executable)
--- a/gruntmaster-exec
+++ b/gruntmaster-exec
@@ -18,9 +18,6 @@ use constant +{
        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/;
@@ -59,12 +56,12 @@ 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;
@@ -87,14 +84,12 @@ if ($ret) {
                        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;
        say STDERR "Executing: ", join ' ', map { "'$_'" } @ARGV if $debug;
        exec @ARGV;