svn merge -r10090:10092 https://eris.llnl.gov/svn/slurm/branches/slurm-1.1

src/common/log.c

@@ -73,6 +73,7 @@
 #include <slurm/slurm_errno.h>
 
 #include "src/common/log.h"
+#include "src/common/fd.h"
 #include "src/common/macros.h"
 #include "src/common/safeopen.h"
 #include "src/common/xassert.h"
@@ -239,8 +240,13 @@ _log_init(char *prog, log_options_t opt, log_facility_t fac, char *logfile )
 		log->logfp = fp;
 	}
 
-	if (log->logfp && (fileno(log->logfp) < 0))
-		log->logfp = NULL;
+	if (log->logfp) {
+		int fd;
+		if ((fd = fileno(log->logfp)) < 0)
+			log->logfp = NULL;
+		else
+			fd_set_close_on_exec(fd);
+	}
 
 	log->initialized = 1;
  out:

src/slurmd/slurmstepd/task.c

@@ -361,14 +361,13 @@ exec_task(slurmd_job_t *job, int i, int waitfd)
 		job->env[0] = (char *)NULL;
 	}
 
-	log_fini();
 	execve(task->argv[0], task->argv, job->env);
 
 	/* 
 	 * print error message and clean up if execve() returns:
 	 */
-	fprintf(stderr, "Unable to run executable \"%s\"\n", task->argv[0]);
-	exit(42);
+	error("execve(): %s: %m", task->argv[0]); 
+	exit(errno);
 }
 
 static void