Merge pull request #4 from xrootd/master

Get changes from xrd master
xrootd · May 20, 2016 · e989e0b · e989e0b
2 parents 5445006 + c2556ae
commit e989e0b
Show file tree

Hide file tree

Showing 12 changed files with 328 additions and 151 deletions.
diff --git a/docs/PreReleaseNotes.txt b/docs/PreReleaseNotes.txt
@@ -6,11 +6,14 @@ Prerelease Notes
 ================
 
 + **New Features**
+  * [Server] Fixes #345 - add sid to TOD structure (ABI compliant).
   * [Server] Implement resource selection affinity (primarily for ssi).
 
 + **Major bug fixes**
+  * [Authentication/sss] Fix dynamic id incompatability introduced in 4.0.
 
 + **Minor bug fixes**
+  * [Server] Fixes #344 - squash path before checking for static redirect.
   * [Server] Free Entity before replacing it from the cache (memleak).  
 
 + **Miscellaneous**
diff --git a/packaging/rhel/xrootd.functions b/packaging/rhel/xrootd.functions
@@ -139,10 +139,15 @@ function stopDaemon()
 {
   echo -n "Shutting down xrootd ($1, $5): "
   PIDFILE="/var/run/xrootd/$1-$5.pid"
-  killproc -p $PIDFILE $1
-  RETVAL=$?
+  if [ -e $PIDFILE ]; then
+    killproc -p $PIDFILE $1
+    RETVAL=$?
+    echo
+    return $RETVAL
+  fi
+  echo -n "$1-$5 not running"
   echo
-  return $RETVAL
+  return 0
 }
 
 #-------------------------------------------------------------------------------