X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=gruntmaster-exec;h=8ab857b2c469504182859214d6d2ab402489b5fc;hp=9590b4e34173feaa8198bfa13e84e424d810bea6;hb=6f7e6b072e24d3464b18d4768a3da52ee15b8565;hpb=74ab88697ef110b659d15e266649f162bc1c6103 diff --git a/gruntmaster-exec b/gruntmaster-exec index 9590b4e..8ab857b 100755 --- 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,7 +56,7 @@ if ($ret) { } $tle = 1 }; - alarm ($timeout || 5); + alarm ($timeout || 10); waitpid $ret, 0; alarm 0; if (@sudo) { @@ -93,8 +90,6 @@ if ($ret) { 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;