From ed51bd4968a903e13bdcded869a644fd0d28353c Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Fri, 26 Nov 2010 11:49:35 -0500 Subject: [PATCH] Use only addr_cur when reporting connection failures in libpq. --- src/interfaces/libpq/fe-connect.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index 6593f21d55..8b5516759f 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -989,8 +989,6 @@ connectFailureMessage(PGconn *conn, int errorno) { char host_addr[NI_MAXHOST]; bool display_host_addr; - struct sockaddr_in *host_addr_struct = (struct sockaddr_in *) - &conn->raddr.addr; /* * Optionally display the network address with the hostname. @@ -998,8 +996,9 @@ connectFailureMessage(PGconn *conn, int errorno) */ if (conn->pghostaddr != NULL) strlcpy(host_addr, conn->pghostaddr, NI_MAXHOST); - else if (inet_net_ntop(conn->addr_cur->ai_family, &host_addr_struct->sin_addr, - host_addr_struct->sin_family == AF_INET ? 32 : 128, + else if (inet_net_ntop(conn->addr_cur->ai_family, + &conn->addr_cur->ai_addr, + conn->addr_cur->ai_family == AF_INET ? 32 : 128, host_addr, sizeof(host_addr)) == NULL) strcpy(host_addr, "???");