svn merge -r21131:21179 https://eris.llnl.gov/svn/slurm/branches/slurm-2.1

NEWS

@@ -501,6 +501,12 @@ documents those changes that are of interest to users and admins.
     "man wiki.conf" for more information.
  -- Add "JobAggregationTime=#" field SchedulerParameter configuration parameter
     output.
+ -- Modify init.d/slurm and slurmdbd scripts to prevent the possible
+    inadvertent inclusion of "." in LD_LIBRARY_PATH environment variable.
+    To fail, the script would need to be executed by user root or SlurmUser
+    without the LD_LIBRARY_PATH environment variable set and there would
+    have to be a maliciously altered library in the working directory (it
+    probably can not be exploited).
 
 * Changes in SLURM 2.1.13
 =========================

etc/init.d.slurm

@@ -81,6 +81,13 @@ if [ ! -f $CONFDIR/slurm.conf ]; then
    exit 1
 fi
 
+# setup library paths for slurm and munge support
+if [ "$LD_LIBRARY_PATH" = "" ]; then
+    export LD_LIBRARY_PATH="$LIBDIR"
+else
+    export LD_LIBRARY_PATH="$LIBDIR:$LD_LIBRARY_PATH"
+fi
+
 start() {
     prog=$1
     shift

etc/init.d.slurmdbd

@@ -69,6 +69,13 @@ if [ ! -f $CONFDIR/slurmdbd.conf ]; then
    exit 1
 fi
 
+# setup library paths for slurm and munge support
+if [ "$LD_LIBRARY_PATH" = "" ]; then
+    export LD_LIBRARY_PATH="$LIBDIR"
+else
+    export LD_LIBRARY_PATH="$LIBDIR:$LD_LIBRARY_PATH"
+fi
+
 start() {
     prog=$1
     shift