From: Robert Haas Date: Mon, 1 May 2017 15:27:09 +0000 (-0400) Subject: libpq: Fix inadvertent change in .pgpass lookup behavior. X-Git-Tag: REL_10_BETA1~129 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bdac9836d;p=thirdparty%2Fpostgresql.git libpq: Fix inadvertent change in .pgpass lookup behavior. Commit 274bb2b3857cc987cfa21d14775cae9b0dababa5 caused password file lookups to use the hostaddr in preference to the host, but that was not intended and the documented behavior is the opposite. Report and patch by Kyotaro Horiguchi. Discussion: http://postgr.es/m/20170428.165432.60857995.horiguchi.kyotaro@lab.ntt.co.jp --- diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index 74e26edad66..eb5aaf70985 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -978,9 +978,18 @@ connectOptions2(PGconn *conn) for (i = 0; i < conn->nconnhost; i++) { - /* Try to get a password for this host from pgpassfile */ + /* + * Try to get a password for this host from pgpassfile. We use host + * name rather than host address in the same manner to PQhost(). + */ + char *pwhost = conn->connhost[i].host; + + if (conn->connhost[i].type == CHT_HOST_ADDRESS && + conn->pghost != NULL && conn->pghost[0] != '\0') + pwhost = conn->pghost; + conn->connhost[i].password = - passwordFromFile(conn->connhost[i].host, + passwordFromFile(pwhost, conn->connhost[i].port, conn->dbName, conn->pguser,