mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-01-30 19:00:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use conn->raddr consistently for non-connect libpq error reporting.

Browse Source
This commit is contained in:
Bruce Momjian 2010-11-26 13:26:13 -05:00
parent bad8277f13
commit f2eba413db
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -989,6 +989,8 @@ connectFailureMessage(PGconn *conn, int errorno)
{ {
char host_addr[NI_MAXHOST]; char host_addr[NI_MAXHOST];
bool display_host_addr; bool display_host_addr;
struct sockaddr_in *host_addr_struct = (struct sockaddr_in *)
&conn->raddr.addr;
/* /*
* Optionally display the network address with the hostname. * Optionally display the network address with the hostname.
@ -996,9 +998,9 @@ connectFailureMessage(PGconn *conn, int errorno)
*/ */
if (conn->pghostaddr != NULL) if (conn->pghostaddr != NULL)
strlcpy(host_addr, conn->pghostaddr, NI_MAXHOST); strlcpy(host_addr, conn->pghostaddr, NI_MAXHOST);
else if (inet_net_ntop(conn->addr_cur->ai_family, else if (inet_net_ntop(host_addr_struct->sin_family,
&conn->addr_cur->ai_addr, &host_addr_struct->sin_addr.s_addr,
conn->addr_cur->ai_family == AF_INET ? 32 : 128, host_addr_struct->sin_family == AF_INET ? 32 : 128,
host_addr, sizeof(host_addr)) == NULL) host_addr, sizeof(host_addr)) == NULL)
strcpy(host_addr, "???"); strcpy(host_addr, "???");