Cherrypick bugfixes from master

packaging/rhel/xrootd.spec.in

@@ -646,7 +646,7 @@ fi
 
 %preun server
 if [ $1 -eq 0 ] ; then
-    for DAEMON in xrootd cmsd frm_purged frm xfrd; do
+    for DAEMON in xrootd cmsd frm_purged frm_xfrd; do
         for INSTANCE in `/usr/bin/systemctl | grep $DAEMON@ | awk '{print $1;}'`; do
             /usr/bin/systemctl --no-reload disable $INSTANCE > /dev/null 2>&1 || :
             /usr/bin/systemctl stop $INSTANCE > /dev/null 2>&1 || :
@@ -657,7 +657,7 @@ fi
 %postun server
 if [ $1 -ge 1 ] ; then
     /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-    for DAEMON in xrootd cmsd frm_purged frm xfrd; do
+    for DAEMON in xrootd cmsd frm_purged frm_xfrd; do
         for INSTANCE in `/usr/bin/systemctl | grep $DAEMON@ | awk '{print $1;}'`; do
             /usr/bin/systemctl try-restart $INSTANCE >/dev/null 2>&1 || :
         done

src/XrdOuc/XrdOucUtils.cc

@@ -645,7 +645,9 @@ void XrdOucUtils::Sanitize(char *str, char subc)
 //
    if (*str)
       {if (*str == '-') *str = subc;
-       str++;
+          else if (*str == ' ') *str = subc;
+       char *blank = rindex(str, ' ');
+       if (blank) while(*blank == ' ') *blank-- = 0;
        while(*str)
             {if (!isalnum(*str) && index("_-.", *str) == 0) *str = subc;
              str++;

src/XrdTpc/XrdTpcState.hh

@@ -11,6 +11,7 @@
 class XrdSfsFile;
 class XrdHttpExtReq;
 typedef void CURL;
+struct curl_slist;
 
 namespace TPC {
 class Stream;

src/XrdXrootd/XrdXrootdConfig.cc

@@ -1283,7 +1283,7 @@ int XrdXrootdProtocol::xmon(XrdOucStream &Config)
 //
 #if !defined(__solaris__) || !defined(_IEEE_754)
    if (monFSopt & XROOTD_MON_FSSSQ && !(std::numeric_limits<double>::is_iec559))
-      {monFSopt &= !XROOTD_MON_FSSSQ;
+      {monFSopt &= ~XROOTD_MON_FSSSQ;
        eDest.Emsg("Config","Warning, 'fstat ssq' ignored; platform does not "
                            "use IEEE754 floating point.");
       }

src/XrdXrootd/XrdXrootdTransit.cc

@@ -232,7 +232,7 @@ void XrdXrootdTransit::Init(XrdXrootd::Bridge::Result *respP, // Private
    XrdNetAddrInfo *addrP;
    const char *who;
    char uname[sizeof(Request.login.username)+1];
-   int pID, n;
+   int pID;
 
 // Set standard stuff
 //
@@ -264,10 +264,8 @@ void XrdXrootdTransit::Init(XrdXrootd::Bridge::Result *respP, // Private
 // Develop a trace identifier
 //
    myMutex.Lock(); pID = ++bID; myMutex.UnLock();
-   n = strlen(nameP);
-   if (n >= int(sizeof(uname))) n = sizeof(uname)-1;
    strncpy(uname, nameP, sizeof(uname)-1);
-   uname[n] = 0;
+   uname[sizeof(uname)-1] = 0;
    XrdOucUtils::Sanitize(uname);
    linkP->setID(uname, pID);
 

src/XrdXrootd/XrdXrootdXeq.cc

@@ -883,7 +883,7 @@ int XrdXrootdProtocol::do_Login()
 // Unmarshall the pid and construct username using the POSIX.1-2008 standard
 //
    pid = (int)ntohl(Request.login.pid);
-   strncpy(uname, (const char *)Request.login.username, sizeof(uname)-2);
+   strncpy(uname, (const char *)Request.login.username, sizeof(uname)-1);
    uname[sizeof(uname)-1] = 0;
    XrdOucUtils::Sanitize(uname);
 

utils/xrootd-config

@@ -39,7 +39,7 @@ Generic options
 
 Compilation support options
   --cflags      print pre-processor and compiler flags
-  --plugin-vesion print plug-in version suffix
+  --plugin-version print plug-in version suffix
 
 Install directories XRootD was configured to
   --prefix