From ab4f6392137d01d9513714e9d8c20fc0883e9a90 Mon Sep 17 00:00:00 2001
From: Steven Murray <steven.murray@cern.ch>
Date: Thu, 17 Apr 2014 18:47:24 +0200
Subject: [PATCH] bug #104330: rmcd listening port should not be the result of
getservbyname()
Fixed in the trunk ready for the version 2.1.15.x release of CASTOR.
---
mediachanger/castorrmc/rmc/rmc_serv.c | 3 ---
mediachanger/castorrmc/rmc/send2rmc.c | 4 ----
2 files changed, 7 deletions(-)
diff --git a/mediachanger/castorrmc/rmc/rmc_serv.c b/mediachanger/castorrmc/rmc/rmc_serv.c
index beced7e2bc..584a24d3b5 100644
--- a/mediachanger/castorrmc/rmc/rmc_serv.c
+++ b/mediachanger/castorrmc/rmc/rmc_serv.c
@@ -62,7 +62,6 @@ int rmc_main(const char *const robot)
char sense[MAXSENSE];
struct sockaddr_in sin;
struct smc_status smc_status;
- struct servent *sp;
struct timeval timeval;
char func[16];
@@ -149,8 +148,6 @@ int rmc_main(const char *const robot)
const char *p;
if ((p = getenv ("RMC_PORT")) || (p = getconfent ("RMC", "PORT", 0))) {
sin.sin_port = htons ((unsigned short)atoi (p));
- } else if ((sp = getservbyname ("rmc", "tcp"))) {
- sin.sin_port = sp->s_port;
} else {
sin.sin_port = htons ((unsigned short)RMC_PORT);
}
diff --git a/mediachanger/castorrmc/rmc/send2rmc.c b/mediachanger/castorrmc/rmc/send2rmc.c
index 6121027433..70d13a9f45 100644
--- a/mediachanger/castorrmc/rmc/send2rmc.c
+++ b/mediachanger/castorrmc/rmc/send2rmc.c
@@ -41,15 +41,11 @@ int send2rmc(
char rmchost[CA_MAXHOSTNAMELEN+1];
int s;
struct sockaddr_in sin; /* internet socket */
- struct servent *sp;
strncpy (func, "send2rmc", 16);
sin.sin_family = AF_INET;
if ((p = getenv ("RMC_PORT")) || (p = getconfent ("RMC", "PORT", 0))) {
sin.sin_port = htons ((unsigned short)atoi (p));
- } else if ((sp = Cgetservbyname ("rmc", "tcp"))) {
- sin.sin_port = sp->s_port;
- serrno = 0;
} else {
sin.sin_port = htons ((unsigned short)RMC_PORT);
serrno = 0;
--
GitLab