Change some return codes to make srun happy

src/common/global_srun.c

@@ -207,8 +207,10 @@ static void * _p_signal_task(void *args)
 	 *  Report error unless it is "Invalid job id" which 
 	 *    probably just means the tasks exited in the meanwhile.
 	 */
-	if ((rc != 0) && (rc != ESLURM_INVALID_JOB_ID)
-	&&  (rc != ESLURMD_JOB_NOTRUNNING) && (rc != ESRCH)) {
+	if ((rc != 0)
+	    && (rc != ESLURM_INVALID_JOB_ID)
+	    && (rc != ESLURMD_JOB_NOTRUNNING)
+	    && (rc != ESRCH)) {
 		error("%s: signal: %s", host, slurm_strerror(rc));
 	}
 

src/slurmd/slurmd/req.c

@@ -857,7 +857,7 @@ _rpc_signal_tasks(slurm_msg_t *msg, slurm_addr *cli_addr)
 			   req->job_id, req->job_step_id);
 	if (fd == -1) {
 		error("stepd_connect failed: %m");
-		rc = EPERM;
+		rc = ESLURM_INVALID_JOB_ID;
 		goto done;
 	}
 	if ((step = stepd_get_info(fd)) == NULL) {
@@ -916,7 +916,7 @@ _rpc_terminate_tasks(slurm_msg_t *msg, slurm_addr *cli_addr)
 			   req->job_id, req->job_step_id);
 	if (fd == -1) {
 		error("stepd_connect failed: %m");
-		rc = EPERM;
+		rc = ESLURM_INVALID_JOB_ID;
 		goto done;
 	}
 	if (!(step = stepd_get_info(fd))) {
@@ -1048,7 +1048,7 @@ _rpc_reattach_tasks(slurm_msg_t *msg, slurm_addr *cli)
 			   req->job_id, req->job_step_id);
 	if (fd == -1) {
 		error("stepd_connect failed: %m");
-		rc = EPERM;
+		rc = ESLURM_INVALID_JOB_ID;
 		goto done;
 	}
 	if ((step = stepd_get_info(fd)) == NULL) {