Commitbdac983

committed

libpq: Fix inadvertent change in .pgpass lookup behavior.

Commit274bb2b caused password filelookups to use the hostaddr in preference to the host, but that wasnot 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

1 parentfed6df4 commitbdac983Copy full SHA for bdac983

File tree

+11

-2

lines changed

+11

-2

lines changed

Lines changed: 11 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -978,9 +978,18 @@ connectOptions2(PGconn *conn)`
`978`	`978`
`979`	`979`	`for (i=0;i<conn->nconnhost;i++)`
`980`	`980`	`{`
`981`		`-/* Try to get a password for this host from pgpassfile */`
	`981`	`+/*`
	`982`	`+ * Try to get a password for this host from pgpassfile. We use host`
	`983`	`+ * name rather than host address in the same manner to PQhost().`
	`984`	`+ */`
	`985`	`+char*pwhost=conn->connhost[i].host;`
	`986`	`+`
	`987`	`+if (conn->connhost[i].type==CHT_HOST_ADDRESS&&`
	`988`	`+conn->pghost!=NULL&&conn->pghost[0]!='\0')`
	`989`	`+pwhost=conn->pghost;`
	`990`	`+`
`982`	`991`	`conn->connhost[i].password=`
`983`		`-passwordFromFile(conn->connhost[i].host,`
	`992`	`+passwordFromFile(pwhost,`
`984`	`993`	`conn->connhost[i].port,`
`985`	`994`	`conn->dbName,`
`986`	`995`	`conn->pguser,`

Comments

(0)