rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use only addr_cur when reporting connection failures in libpq.

This commit is contained in:
Bruce Momjian 2010-11-26 11:49:35 -05:00
parent 4f6deef2fb
commit ed51bd4968
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/interfaces/libpq/fe-connect.c
View File

@ -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, "???");