diff --git a/XRootdSSiRmcd/CMakeLists.txt b/XRootdSSiRmcd/CMakeLists.txt
index c2524e1fe66a0e702d6e18de86973aaab5b00b17..5f1cdb7cc3a884a1af901ebd0873f3e565194c85 100644
--- a/XRootdSSiRmcd/CMakeLists.txt
+++ b/XRootdSSiRmcd/CMakeLists.txt
@@ -45,9 +45,9 @@ include_directories(${CMAKE_BINARY_DIR}/XRootdSSiRmcd ${PROTOBUF3_INCLUDE_DIRS})
add_executable(cta-xsmc RmcdClient.cpp)
target_link_libraries(cta-xsmc XrdSsi-4 XrdSsiLib XrdSsiPbRmcd XrdUtils)
set_property(TARGET cta-xsmc APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH})
-install (TARGETS cta-xsmc DESTINATION /usr/bin)
-install (FILES cta-xsmc-mount.1cta DESTINATION /usr/share/man/man1)
-install (FILES cta-xsmc-dismount.1cta DESTINATION /usr/share/man/man1)
+#install (TARGETS cta-xsmc DESTINATION /usr/bin)
+#install (FILES cta-xsmc-mount.1cta DESTINATION /usr/share/man/man1)
+#install (FILES cta-xsmc-dismount.1cta DESTINATION /usr/share/man/man1)
#
# XRootD SSI plugin for Test Server
@@ -61,9 +61,9 @@ add_library(XrdSsiRmcd MODULE
)
target_link_libraries(XrdSsiRmcd XrdSsi-4 XrdSsiLib XrdSsiPbRmcd XrdUtils)
set_property(TARGET XrdSsiRmcd APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH})
-install(TARGETS XrdSsiRmcd DESTINATION usr/${CMAKE_INSTALL_LIBDIR})
+#install(TARGETS XrdSsiRmcd DESTINATION usr/${CMAKE_INSTALL_LIBDIR})
-install (FILES cta-xrmcd.conf DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/cta)
-install (FILES cta-xrmcd.logrotate DESTINATION /etc/logrotate.d RENAME cta-xrmcd)
-install (FILES cta-xrmcd.sysconfig DESTINATION /etc/sysconfig RENAME cta-xrmcd)
-install (FILES cta-xrmcd.service DESTINATION /etc/systemd/system)
+#install (FILES cta-xrmcd.conf DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/cta)
+#install (FILES cta-xrmcd.logrotate DESTINATION /etc/logrotate.d RENAME cta-xrmcd)
+#install (FILES cta-xrmcd.sysconfig DESTINATION /etc/sysconfig RENAME cta-xrmcd)
+#install (FILES cta-xrmcd.service DESTINATION /etc/systemd/system)
diff --git a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/rmcd.sh b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/rmcd.sh
index 22b7579b6ffa3fcfe06a47910ac6467918e02a0f..ecfddc79fd2d8036a828ce69d4d954ea08da9722 100755
--- a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/rmcd.sh
+++ b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/rmcd.sh
@@ -26,7 +26,7 @@ CTA_RMCD_OPTIONS=/dev/smc
EOF
# install RPMs?
- test -e /etc/buildtreeRunner || yum -y install mt-st mtx lsscsi sg3_utils cta-rmcd
+ test -e /etc/buildtreeRunner || yum -y install mt-st mtx lsscsi sg3_utils cta-rmcd cta-smc
# rmcd will be running as non root user, we need to fix a few things:
# device access rights
@@ -41,7 +41,7 @@ EOF
else
# systemd is not available
# install RPMs?
- test -e /etc/buildtreeRunner || yum -y install mt-st mtx lsscsi sg3_utils cta-rmcd
+ test -e /etc/buildtreeRunner || yum -y install mt-st mtx lsscsi sg3_utils cta-rmcd cta-smc
# to get rmcd logs to stdout
tail -F /var/log/cta/cta-rmcd.log &
diff --git a/cta.spec.in b/cta.spec.in
index 67c7ef15d53eceeb4e9f3638729f82d21028619c..27ba37c032ddbf43c7ceb3794dec6a91cf89ee40 100644
--- a/cta.spec.in
+++ b/cta.spec.in
@@ -133,51 +133,6 @@ The tape server daemon
%systemd_postun cta-taped.service
%systemdDaemonReload
-%package -n cta-xrmcd
-Summary: CERN Tape Archive: Xrootd plugin
-Group: Application/CTA
-Requires: logrotate
-Requires: cta-common = %{version}-%{release}
-Requires: cta-lib = %{version}-%{release}
-Requires: xrootd-server
-%description -n cta-xrmcd
-CERN Tape Archive:
-The xroot plugin
-%files -n cta-xrmcd
-%defattr(0755,root,root)
-%{_libdir}/libXrdSsiRmcd.so*
-%attr(0644,root,root) %config(noreplace) /etc/logrotate.d/cta-xrmcd
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/cta/cta-xrmcd.conf
-%attr(0644,cta,tape) /etc/systemd/system/cta-xrmcd.service
-%attr(0644,root,root) %config(noreplace) /etc/sysconfig/cta-xrmcd
-
-#xrmcd installs libraries so we need ldconfig.
-%post -n cta-xrmcd
-/sbin/ldconfig
-%systemd_post cta-xrmcd.service
-%systemdDaemonReload
-
-%preun -n cta-xrmcd
-%systemd_preun cta-xrmcd.service
-
-%postun -n cta-xrmcd
-/sbin/ldconfig
-%systemd_post cta-xrmcd.service
-%systemdDaemonReload
-
-%package -n cta-xsmc
-Summary: CERN Tape Archive: command line interface
-Group: Application/CTA
-Requires: cta-lib = %{version}-%{release}
-%description -n cta-xsmc
-CERN Tape Archive:
-The xroot plugin
-%files -n cta-xsmc
-%defattr(-,root,root)
-%attr(0755,root,root) %{_bindir}/cta-xsmc
-%attr(0644,root,root) %doc /usr/share/man/man1/cta-xsmc-mount.1cta.gz
-%attr(0644,root,root) %doc /usr/share/man/man1/cta-xsmc-dismount.1cta.gz
-
%package -n cta-frontend
Summary: CERN Tape Archive: Xrootd plugin
Group: Application/CTA
@@ -337,22 +292,19 @@ Scripts and utilities to faciliate working with the CTA catalogue
%attr(0644,root,root) %doc /usr/share/man/man1/cta-database-poll.1cta.gz
%package -n cta-rmcd
-Summary: Tools to faciliate working with rmcd and smc in cta
+Summary: The Remote Media Changer daemon (rmcd)
Group: Application/CTA
Requires: logrotate
Requires: cta-common = %{version}-%{release}
%description -n cta-rmcd
CERN Tape Archive:
-Tools to faciliate working with rmcd and smc in cta
+The Remote Media Changer daemon (rmcd)
%files -n cta-rmcd
%defattr(-,root,root)
%attr(0644,root,root) %config(noreplace) /etc/logrotate.d/cta-rmcd
%attr(0644,root,root) %doc /usr/share/man/man1/cta-rmcd.1cta.gz
%attr(0755,root,root) %{_bindir}/cta-rmcd
-%attr(0755,root,root) %{_bindir}/cta-smc
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/cta/cta-rmcd.conf
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/cta/cta-smc.conf
-%attr(0644,root,root) %doc /usr/share/man/man1/cta-smc.1cta.gz
%attr(0644,root,root) %config(noreplace) /etc/sysconfig/cta-rmcd
%attr(0644,root,root) /etc/systemd/system/cta-rmcd.service
@@ -367,6 +319,18 @@ Tools to faciliate working with rmcd and smc in cta
%systemd_postun cta-rmcd.service
%systemdDaemonReload
+%package -n cta-smc
+Summary: The client of the Remote Media Changer Daemon (rmcd)
+Group: Application/CTA
+%description -n cta-smc
+CERN Tape Archive:
+The client of the Remote Media Changer Daemon (rmcd)
+%files -n cta-smc
+%defattr(-,root,root)
+%attr(0755,root,root) %{_bindir}/cta-smc
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/cta/cta-smc.conf
+%attr(0644,root,root) %doc /usr/share/man/man1/cta-smc.1cta.gz
+
%package -n cta-common
Summary: CERN Tape Archive common items
Group: Application/CTA
diff --git a/mediachanger/castorrmc/rmc/cta-rmcd.1cta b/mediachanger/castorrmc/rmc/cta-rmcd.1cta
index 3738da9ef960fb35f35ce24dcb25baab1eb22140..df5c75ed2e5c5179beee840000e4ca2e88408b7d 100644
--- a/mediachanger/castorrmc/rmc/cta-rmcd.1cta
+++ b/mediachanger/castorrmc/rmc/cta-rmcd.1cta
@@ -55,7 +55,7 @@ setenv RMC_PORT 5014
.RE
.LP
an entry in
-.B /etc/castor/castor.conf
+.B /etc/cta/cta-rmcd.conf
like:
.RS
.HP
diff --git a/mediachanger/castorrmc/rmc/rmc_procreq.c b/mediachanger/castorrmc/rmc/rmc_procreq.c
index 46da40333d8e74f188ccf2065eb28f918999bc8c..7ecfd2d9843a5a9a4e433b658f05f39037193c9d 100644
--- a/mediachanger/castorrmc/rmc/rmc_procreq.c
+++ b/mediachanger/castorrmc/rmc/rmc_procreq.c
@@ -110,7 +110,7 @@ int rmc_srv_findcart(const struct rmc_srv_rqst_context *const rqst_context) {
unmarshall_LONG (rbp, type);
unmarshall_LONG (rbp, startaddr);
unmarshall_LONG (rbp, nbelem);
- snprintf (logbuf, CA_MAXVIDLEN+15, "findcart %s %d", template, nbelem);
+ snprintf (logbuf, sizeof(template)+15, "findcart %s %d", template, nbelem);
rmc_logreq (func, logbuf);
if (nbelem < 1) {
diff --git a/mediachanger/castorrmc/rmc/rmc_send_scsi_cmd.c b/mediachanger/castorrmc/rmc/rmc_send_scsi_cmd.c
index 7acc000161572b292fee6da156942e4a25d29c9c..f383c97b46e925fabefe4a74b8246b1d89d85311 100644
--- a/mediachanger/castorrmc/rmc/rmc_send_scsi_cmd.c
+++ b/mediachanger/castorrmc/rmc/rmc_send_scsi_cmd.c
@@ -277,7 +277,7 @@ int rmc_send_scsi_cmd (
if ((sg_hd->sense_buffer[0] & 0x70) &&
((sg_hd->sense_buffer[2] & 0xE0) == 0 ||
(sg_hd->sense_buffer[2] & 0xF) != 0)) {
- char tmp_msgbuf[132];
+ char tmp_msgbuf[32];
snprintf (tmp_msgbuf, sizeof(tmp_msgbuf), "%s ASC=%X ASCQ=%X",
sk_msg[*(sense+2) & 0xF], *(sense+12), *(sense+13));
tmp_msgbuf[sizeof(tmp_msgbuf) - 1] = '\0';
diff --git a/mediachanger/castorrmc/rmc/rmc_serv.c b/mediachanger/castorrmc/rmc/rmc_serv.c
index e96612482232addeeb889a16901a7faa4bd5398b..b31b9668e91c66b77dada6b3e5d2cba24a582c29 100644
--- a/mediachanger/castorrmc/rmc/rmc_serv.c
+++ b/mediachanger/castorrmc/rmc/rmc_serv.c
@@ -34,7 +34,7 @@
#include <sys/stat.h>
#include "rmc_send_scsi_cmd.h"
-#define PATH_CONF "cta-rmcd.conf"
+#define PATH_CONF "/etc/cta/cta-rmcd.conf"
/* Forward declaration */
static int rmc_getreq(const int s, int *const req_type, char *const req_data,
diff --git a/mediachanger/castorrmc/rmc/rmc_smcsubr.c b/mediachanger/castorrmc/rmc/rmc_smcsubr.c
index 6b991df31a3a7c4fe4329ad9bf70f50bb4acee00..21e557019fe3c526902d2b3585006ca7ab42aba0 100644
--- a/mediachanger/castorrmc/rmc/rmc_smcsubr.c
+++ b/mediachanger/castorrmc/rmc/rmc_smcsubr.c
@@ -25,7 +25,7 @@
#include "smc_constants.h"
#define RBT_XTRA_PROC 10
-#define PATH_CONF "cta-smc.conf"
+#define PATH_CONF "/etc/cta/cta-smc.conf"
static struct smc_status smc_status;
static const char *smc_msgaddr;
diff --git a/mediachanger/castorrmc/rmc/send2rmc.c b/mediachanger/castorrmc/rmc/send2rmc.c
index 6a445c6860c1ed681157272bc9ddc0ac11676580..5ef5bfc2429706651eded987d84b06687df3f61c 100644
--- a/mediachanger/castorrmc/rmc/send2rmc.c
+++ b/mediachanger/castorrmc/rmc/send2rmc.c
@@ -17,7 +17,7 @@
#include "rmc_constants.h"
#include "serrno.h"
- #define PATH_CONF "cta-rmcd.conf"
+#define PATH_CONF "/etc/cta/cta-rmcd.conf"
/* send2tpd - send a request to the SCSI media changer server and wait for the reply */
int send2rmc(
diff --git a/mediachanger/castorrmc/rmc/smc.c b/mediachanger/castorrmc/rmc/smc.c
index 52669b475fe4a908d646f3e40d27e47da7fe5b5b..5eb77fe05c7b7f71c9f2c4e76e6a20bc822b6713 100644
--- a/mediachanger/castorrmc/rmc/smc.c
+++ b/mediachanger/castorrmc/rmc/smc.c
@@ -20,7 +20,7 @@
/* exit codes */
#define USERR 1
-#define PATH_CONF "cta-smc.conf"
+#define PATH_CONF "/etc/cta/cta-smc.conf"
#define TEXT_RED "\x1b[31;1m"
#define TEXT_NORMAL "\x1b[0m"