Merge branch 'slurm-14.11'

NEWS

@@ -262,6 +262,7 @@ documents those changes that are of interest to users and administrators.
     random crashing in db2 when the slurmctld is exiting.
  -- Make full node reservations display correctly the core count instead of
     cpu count.
+ -- Preserve original errno on execve() failure in task plugin.
 
 * Changes in Slurm 14.11.6
 ==========================

doc/html/team.shtml

@@ -154,6 +154,7 @@ Lead Slurm developers are:
 <li>Pere Munt (Barcelona Supercomputing Center, Spain)</li>
 <br>
 <li>Denis Nadeau</li>
+<li>Jon Nelson (Dyn)</li>
 <li>Mark Nelson (IBM)</li>
 <li>Jim Nordby (Cray)</li>
 <li>Michal Novotny (Masaryk University, Czech Republic)</li>

src/slurmd/slurmstepd/task.c

@@ -367,6 +367,7 @@ exec_task(stepd_step_rec_t *job, int i)
 	int fd, j;
 	stepd_step_task_info_t *task = job->task[i];
 	char **tmp_env;
+	int saved_errno;
 
 	if (i == 0)
 		_make_tmpdir(job);
@@ -495,6 +496,7 @@ exec_task(stepd_step_rec_t *job, int i)
 	}
 
 	execve(task->argv[0], task->argv, job->env);
+	saved_errno = errno;
 
 	/*
 	 * print error message and clean up if execve() returns:
@@ -510,10 +512,12 @@ exec_task(stepd_step_rec_t *job, int i)
 				eol[0] = '\0';
 			else
 				buf[sizeof(buf)-1] = '\0';
+			slurm_seterrno(saved_errno);
 			error("execve(): bad interpreter(%s): %m", buf+2);
 			exit(errno);
 		}
 	}
+	slurm_seterrno(saved_errno);
 	error("execve(): %s: %m", task->argv[0]);
 	exit(errno);
 }