rrd_client, rrd_daemon: Do not require hostnames to contain a dot.

Non-FQDN (e.g. "localhost") are now supported as well. Anything that does not
start with '[' should be (and is now) treated as <name>[:<port>]. -- Sebastian Harl

git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@1930 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/src/rrd_client.c b/src/rrd_client.c
index 287f642..a4f1ba9 100644 (file)
--- a/src/rrd_client.c
+++ b/src/rrd_client.c
@@ -436,8 +436,8 @@ static int rrdc_connect_network (const char *addr_orig) /* {{{ */
       rrd_set_error("garbage after address: %s", port);
       return (-1);
     }
-  } /* if (*addr = ']') */
-  else if (strchr (addr, '.') != NULL) /* Hostname or IPv4 */
+  } /* if (*addr == '[') */
+  else
   {
     port = rindex(addr, ':');
     if (port != NULL)

diff --git a/src/rrd_daemon.c b/src/rrd_daemon.c
index 81c58e1..0ca1818 100644 (file)
--- a/src/rrd_daemon.c
+++ b/src/rrd_daemon.c
@@ -2390,8 +2390,8 @@ static int open_listen_socket_network(const listen_socket_t *sock) /* {{{ */
       fprintf (stderr, "rrdcached: Garbage after address: %s\n", port);
       return (-1);
     }
-  } /* if (*addr = ']') */
-  else if (strchr (addr, '.') != NULL) /* Hostname or IPv4 */
+  } /* if (*addr == '[') */
+  else
   {
     port = rindex(addr, ':');
     if (port != NULL)