Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions judge/runguard.cc
Original file line number Diff line number Diff line change
Expand Up @@ -815,6 +815,20 @@ int groupid(char *name)
return (int) grp->gr_gid;
}

char *username()
{
int saved_errno = errno;
errno = 0; /* per the linux GETPWNAM(3) man-page */

struct passwd *pwd;
pwd = getpwuid(getuid());

if ( pwd==nullptr || errno ) error(errno,"failed to get username");
errno = saved_errno;

return pwd->pw_name;
}

long read_optarg_int(const char *desc, long minval, long maxval)
{
char *ptr;
Expand Down Expand Up @@ -1426,9 +1440,7 @@ int main(int argc, char **argv)

/* And execute child command. */
execvp(cmdname,cmdargs);
struct rlimit limit;
getrlimit(RLIMIT_NPROC, &limit);
error(errno,"cannot start `%s', limit: %ld/%ld | ",cmdname, limit.rlim_cur, limit.rlim_max);
error(errno,"cannot start `%s' as user `%s'", cmdname, username());

default: /* become watchdog */
verbose("child pid = %d", child_pid);
Expand Down
Loading