Skip to content
Merged
Show file tree
Hide file tree
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
4 changes: 3 additions & 1 deletion judge/judgedaemon.main.php
Original file line number Diff line number Diff line change
Expand Up @@ -2271,7 +2271,9 @@ private function testcaseRunInternal(
'chown',
'-R',
posix_getpwuid(posix_geteuid())['name'] . ":",
"$realWorkdir/feedback"
// Use original $passdir that's not rewritten by realpath()
// so it matches the sudoers file if it contains symlinks.
"$passdir/feedback"
]
)
);
Expand Down
2 changes: 1 addition & 1 deletion lib/lib.error.php
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ function logmsg(int $msglevel, string $string): void
// When logging direct to the terminal the checkmark should be green, this
// does not work in log so remove this specific control char.
// This removes both the start and the reset of the color.
syslog($msglevel, preg_replace('# ?\\x1b\[[0-9];?[0-9]*m#', '', $string) . "\n");
syslog($msglevel, preg_replace('# ?\\x1b\[[0-9];?[0-9]*m#', '', $string));
}
}
}
Expand Down
Loading