Update all software to use fi_host_is_localhost(), thus recognizing

common IPv6 "localhost" strings.
haybeseret · Jan 13, 2017 · 511d839 · 511d839
1 parent e30837c
commit 511d839
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/common/toolcommon/tool-common.c b/common/toolcommon/tool-common.c
@@ -64,9 +64,7 @@ ipmi_open (const char *progname,
       goto cleanup;
     }
 
-  if (hostname
-      && strcasecmp (hostname, "localhost") != 0
-      && strcmp (hostname, "127.0.0.1") != 0)
+  if (hostname && !fi_host_is_localhost (hostname))
     {
       if (common_args->driver_type == IPMI_DEVICE_LAN_2_0)
         {

diff --git a/ipmiseld/ipmiseld-ipmi-communication.c b/ipmiseld/ipmiseld-ipmi-communication.c
@@ -86,15 +86,13 @@ ipmiseld_ipmi_setup (ipmiseld_host_data_t *host_data)
       goto cleanup;
     }
 
-  if (host_data->hostname
-      && strcasecmp (host_data->hostname, "localhost") != 0
-      && strcmp (host_data->hostname, "127.0.0.1") != 0)
+  if (host_data->hostname && !fi_host_is_localhost (host_data->hostname))
     {
       if (common_args->driver_type == IPMI_DEVICE_LAN_2_0)
         {
           parse_get_freeipmi_outofband_2_0_flags (common_args->workaround_flags_outofband_2_0,
                                                   &workaround_flags);
-          
+
           if (ipmi_ctx_open_outofband_2_0 (host_data->host_poll->ipmi_ctx,
                                            host_data->hostname,
                                            common_args->username,

diff --git a/libipmimonitoring/ipmi_monitoring_ipmi_communication.c b/libipmimonitoring/ipmi_monitoring_ipmi_communication.c
@@ -48,6 +48,7 @@
 #include "ipmi_monitoring_ipmi_communication.h"
 
 #include "freeipmi-portability.h"
+#include "fi_hostlist.h"
 
 extern uint32_t _ipmi_monitoring_flags;
 
@@ -554,9 +555,7 @@ ipmi_monitoring_ipmi_communication_init (ipmi_monitoring_ctx_t c,
       goto cleanup;
     }
 
-  if (!hostname
-      || !strcasecmp (hostname, "localhost")
-      || !strcmp (hostname, "127.0.0.1"))
+  if (!hostname || fi_host_is_localhost (hostname))
     {
       if (_inband_init (c, config) < 0)
         goto cleanup;