Merge branch 'main' into executable-zipfile-fix-migration

Author: nickygerritsen

judge/runguard.cc

@@ -923,9 +923,7 @@ void setrestrictions()
 	/* Set group-id (must be root for this, so before setting user). */
 	if ( use_group ) {
 		if ( setgid(rungid) ) error(errno,"cannot set group ID to `%d'",rungid);
-		gid_t aux_groups[1];
-		aux_groups[0] = rungid;
-		if ( setgroups(1, aux_groups) ) error(errno,"cannot clear auxiliary groups");
+		if ( setgroups(0, NULL) ) error(errno,"cannot clear auxiliary groups");
 
 		verbose("using group ID `%d'",rungid);
 	}

webapp/src/Service/RejudgingService.php

@@ -335,6 +335,8 @@ public function finishRejudging(Rejudging $rejudging, string $action, ?callable
                             SET result = :aborted
                             WHERE judgingid = :judgingid
                             AND result IS NULL', ['aborted' => 'aborted', 'judgingid' => $submission['judgingid']]);
+                $this->em->getConnection()->executeQuery(
+                    'DELETE FROM queuetask WHERE judgingid = :judgingid', ['judgingid' => $submission['judgingid']]);
             } else {
                 $error = "Unknown action '$action' specified.";
                 throw new BadMethodCallException($error);