Commited51bd4

committed

Use only addr_cur when reporting connection failures in libpq.

1 parent4f6deef commited51bd4Copy full SHA for ed51bd4

File tree

-4

lines changed

-4

lines changed

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -989,17 +989,16 @@ connectFailureMessage(PGconn *conn, int errorno)`
`989`	`989`	`{`
`990`	`990`	`charhost_addr[NI_MAXHOST];`
`991`	`991`	`booldisplay_host_addr;`
`992`		`-structsockaddr_inhost_addr_struct= (structsockaddr_in)`
`993`		`-&conn->raddr.addr;`
`994`	`992`
`995`	`993`	`/*`
`996`	`994`	`*Optionally display the network address with the hostname.`
`997`	`995`	`*This is useful to distinguish between IPv4 and IPv6 connections.`
`998`	`996`	`*/`
`999`	`997`	`if (conn->pghostaddr!=NULL)`
`1000`	`998`	`strlcpy(host_addr,conn->pghostaddr,NI_MAXHOST);`
`1001`		`-elseif (inet_net_ntop(conn->addr_cur->ai_family,&host_addr_struct->sin_addr,`
`1002`		`-host_addr_struct->sin_family==AF_INET ?32 :128,`
	`999`	`+elseif (inet_net_ntop(conn->addr_cur->ai_family,`
	`1000`	`+&conn->addr_cur->ai_addr,`
	`1001`	`+conn->addr_cur->ai_family==AF_INET ?32 :128,`
`1003`	`1002`	`host_addr,sizeof(host_addr))==NULL)`
`1004`	`1003`	`strcpy(host_addr,"???");`
`1005`	`1004`

Comments

(0)