upstream/postgresql
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2026-04-14 21:47:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

libpq: Fix inadvertent change in PQhost() behavior.

Browse source 
Commit 274bb2b385 caused PQhost() to
return the value of the hostaddr parameter rather than the relevant
host when the latter parameter was specified.  That's wrong.  Commit
9a1d0af4ad then amplified the damage by
using PQhost() in more places, so that the SSL test suite started
failing.

Report by Andreas Karlsson; patch by me.
This commit is contained in:
Robert Haas 2016-12-01 14:36:39 -05:00
parent a01a5013d9
commit 11003eb556
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/interfaces/libpq/fe-connect.c
View file

@ -5736,7 +5736,8 @@ PQhost(const PGconn *conn)
{
if (!conn)
return NULL;
if (conn->connhost != 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;