From b4aa2c7cf3c496b17de304bb913d5cf6327afd9e Mon Sep 17 00:00:00 2001
From: Victor Kotlyar <Victor.Kotlyar@cern.ch>
Date: Tue, 18 Jun 2019 14:45:41 +0200
Subject: [PATCH] Fix configuration path for cta-rmcd and cta-smc

---
 mediachanger/castorrmc/rmc/cta-rmcd.1cta | 2 +-
 mediachanger/castorrmc/rmc/rmc_serv.c    | 2 +-
 mediachanger/castorrmc/rmc/rmc_smcsubr.c | 2 +-
 mediachanger/castorrmc/rmc/send2rmc.c    | 2 +-
 mediachanger/castorrmc/rmc/smc.c         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mediachanger/castorrmc/rmc/cta-rmcd.1cta b/mediachanger/castorrmc/rmc/cta-rmcd.1cta
index 3738da9ef9..df5c75ed2e 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_serv.c b/mediachanger/castorrmc/rmc/rmc_serv.c
index e966124822..b31b9668e9 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 6b991df31a..21e557019f 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 6a445c6860..5ef5bfc242 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 52669b475f..5eb77fe05c 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"
 
-- 
GitLab