Allow numbers in hostname, always try to parse with inet_pton

diff --git a/src/objects.c b/src/objects.c
index c8d88cd52fe5975f9afbaf18b5aee173dd96d476..c321fa37b2f2926e05a9eec7b08bd06bdac5cc7e 100644 (file)
--- a/src/objects.c
+++ b/src/objects.c
@@ -932,6 +932,7 @@ static void dns_connect(struct PgSocket *server)
        const char *host = db->host;
        const char *unix_dir;
        int sa_len;
+       int res;
 
        if (!host || host[0] == '/') {
                slog_noise(server, "unix socket: %s", sa_un.sun_path);
@@ -947,23 +948,27 @@ static void dns_connect(struct PgSocket *server)
                         "%s/.s.PGSQL.%d", unix_dir, db->port);
                sa = (struct sockaddr *)&sa_un;
                sa_len = sizeof(sa_un);
+               res = 1;
        } else if (strchr(host, ':')) {  // assume IPv6 address on any : in addr
                slog_noise(server, "inet6 socket: %s", db->host);
                memset(&sa_in6, 0, sizeof(sa_in6));
                sa_in6.sin6_family = AF_INET6;
-               inet_pton(AF_INET6, db->host, (void *) sa_in6.sin6_addr.s6_addr);
+               res = inet_pton(AF_INET6, db->host, &sa_in6.sin6_addr);
                sa_in6.sin6_port = htons(db->port);
                sa = (struct sockaddr *)&sa_in6;
                sa_len = sizeof(sa_in6);
-       } else if (host[0] >= '0' && host[0] <= '9') { // else try IPv4
+       } else { // else try IPv4
                slog_noise(server, "inet socket: %s", db->host);
                memset(&sa_in, 0, sizeof(sa_in));
                sa_in.sin_family = AF_INET;
-               sa_in.sin_addr.s_addr = inet_addr(db->host);
+               res = inet_pton(AF_INET, db->host, &sa_in.sin_addr);
                sa_in.sin_port = htons(db->port);
                sa = (struct sockaddr *)&sa_in;
                sa_len = sizeof(sa_in);
-       } else {
+       }
+
+       /* if simple parse failed, use DNS */
+       if (res != 1) {
                struct DNSToken *tk;
                slog_noise(server, "dns socket: %s", db->host);
                /* launch dns lookup */