Merge branch 'slurm-2.3'

NEWS

@@ -205,6 +205,8 @@ documents those changes that are of interest to users and admins.
     Simon Ruderich.
  -- CRAY: Fix support for configuration with SlurmdTimeout=0 (never mark
     node that is DOWN in ALPS as DOWN in SLURM).
+ -- Fixed the setting of SLURM_SUBMIT_DIR for jobs submitted by Moab (BZ#1467).
+    Patch by Don Lipari, LLNL.
 
 * Changes in SLURM 2.3.4
 ========================

src/common/env.c

@@ -1694,6 +1694,13 @@ char **env_array_from_file(const char *fname)
 		if (_env_array_entry_splitter(ptr, name, sizeof(name),
 					      value, ENV_BUFSIZE) &&
 		    (!_discard_env(name, value))) {
+			/*
+			 * Unset the SLURM_SUBMIT_DIR if it is defined so
+			 * that this new value does not get overwritten
+			 * in the subsequent call to env_array_merge().
+			 */
+			if (strcmp(name, "SLURM_SUBMIT_DIR") == 0)
+				unsetenv(name);
 			env_array_overwrite(&env, name, value);
 		}
 	}