libpq: PQhost to return active connected host or hostaddr

[postgresql] / src / interfaces / libpq / fe-connect.c

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 39c19998c2256412f0125f0d9fa26e87195b97bb..f3057e9d6f5bf5e92703001312d433deb8622353 100644 (file)
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -6017,19 +6017,18 @@ PQhost(const PGconn *conn)
 {
        if (!conn)
                return NULL;
-       if (conn->connhost != NULL &&
-               conn->connhost[conn->whichhost].type != CHT_HOST_ADDRESS)
-               return conn->connhost[conn->whichhost].host;
-       else if (conn->pghost != NULL && conn->pghost[0] != '\0')
-               return conn->pghost;
-       else
+
+       if (conn->connhost != NULL)
        {
-#ifdef HAVE_UNIX_SOCKETS
-               return DEFAULT_PGSOCKET_DIR;
-#else
-               return DefaultHost;
-#endif
+               if (conn->connhost[conn->whichhost].host != NULL &&
+                       conn->connhost[conn->whichhost].host[0] != '\0')
+                       return conn->connhost[conn->whichhost].host;
+               else if (conn->connhost[conn->whichhost].hostaddr != NULL &&
+                                conn->connhost[conn->whichhost].hostaddr[0] != '\0')
+                       return conn->connhost[conn->whichhost].hostaddr;
        }
+
+       return "";
 }
 
 char *
@@ -6037,9 +6036,11 @@ PQport(const PGconn *conn)
 {
        if (!conn)
                return NULL;
+
        if (conn->connhost != NULL)
                return conn->connhost[conn->whichhost].port;
-       return conn->pgport;
+
+       return "";
 }
 
 char *