Merge pull request #53 from matyasselmeci/pr/XC_ENABLE_MULTIUSER.SOFTWARE-5481

Require XC_ENABLE_MULTIUSER to be set to enable multiuser

Author: matyasselmeci

configs/60-osg-multiuser.cfg

@@ -1,18 +1,20 @@
 # Enable multiuser plugin. This makes XRootD to write the files with the
 # ownership of the user that authenticated to the server and not as the
 # 'xrootd' user
-if exec xrootd
+if defined ?~XC_ENABLE_MULTIUSER && exec xrootd 
   ofs.osslib ++ libXrdMultiuser.so
-else
+else if defined ?~XC_ENABLE_MULTIUSER
   ofs.osslib libXrdMultiuser.so default
 fi
 
-# Enable the checksum wrapper
-ofs.ckslib * libXrdMultiuser.so
+if defined ?~XC_ENABLE_MULTIUSER
+  # Enable the checksum wrapper
+  ofs.ckslib * libXrdMultiuser.so
 
-xrootd.chksum max 2 md5 adler32 crc32
+  xrootd.chksum max 2 md5 adler32 crc32
 
-# The checksum plugin that is included in the multiuser can also
-# checksum while it is writing a file.  To turn this on, uncomment the
-# following line:
-# multiuser.checksumonwrite on
+  # The checksum plugin that is included in the multiuser can also
+  # checksum while it is writing a file.  To turn this on, uncomment the
+  # following line:
+  # multiuser.checksumonwrite on
+fi

configs/cmsd-privileged@.service

@@ -8,6 +8,7 @@ After=network-online.target
 [Service]
 # Note "-R xrootd" here instructs xrootd to drop privileges to the xrootd Unix user.
 ExecStart=/usr/bin/cmsd -l /var/log/xrootd/cmsd.log -c /etc/xrootd/xrootd-%i.cfg -k fifo -s /var/run/xrootd/cmsd-%i.pid -n %i -R xrootd
+Environment=XC_ENABLE_MULTIUSER=1
 Type=simple
 Restart=on-abort
 RestartSec=0

configs/xrootd-privileged@.service

@@ -8,6 +8,7 @@ After=network-online.target
 [Service]
 # Note "-R xrootd" here instructs xrootd to drop privileges to the xrootd Unix user.
 ExecStart=/usr/bin/xrootd -l /var/log/xrootd/xrootd.log -c /etc/xrootd/xrootd-%i.cfg -k fifo -s /var/run/xrootd/xrootd-%i.pid -n %i -R xrootd
+Environment=XC_ENABLE_MULTIUSER=1
 Type=simple
 Restart=on-abort
 RestartSec=0