database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-09-11 00:12:06 +03:00
Code Activity

Fix pgpass to work with PQconnectDB().

Browse Source 
Backpatch to 7.3.X.

Report from ljb.
This commit is contained in:
Bruce Momjian
2003-01-08 21:33:53 +00:00
parent 40cb1361a6
commit c8b0ab0bd3
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.213 2002/10/24 23:35:55 tgl Exp $ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.213.2.1 2003/01/08 21:33:53 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@@ -304,6 +304,9 @@ PQconnectStart(const char *conninfo)
conn->pguser = tmp ? strdup(tmp) : NULL; conn->pguser = tmp ? strdup(tmp) : NULL;
tmp = conninfo_getval(connOptions, "password"); tmp = conninfo_getval(connOptions, "password");
conn->pgpass = tmp ? strdup(tmp) : NULL; conn->pgpass = tmp ? strdup(tmp) : NULL;
if (conn->pgpass == NULL || conn->pgpass[0] == '\0')
conn->pgpass = PasswordFromFile(conn->pghost, conn->pgport,
conn->dbName, conn->pguser);
tmp = conninfo_getval(connOptions, "connect_timeout"); tmp = conninfo_getval(connOptions, "connect_timeout");
conn->connect_timeout = tmp ? strdup(tmp) : NULL; conn->connect_timeout = tmp ? strdup(tmp) : NULL;
#ifdef USE_SSL #ifdef USE_SSL
@@ -501,9 +504,6 @@ PQsetdbLogin(const char *pghost, const char *pgport, const char *pgoptions,
conn->pgpass = strdup(pwd); conn->pgpass = strdup(pwd);
else if ((tmp = getenv("PGPASSWORD")) != NULL) else if ((tmp = getenv("PGPASSWORD")) != NULL)
conn->pgpass = strdup(tmp); conn->pgpass = strdup(tmp);
else if ((tmp = PasswordFromFile(conn->pghost, conn->pgport,
conn->dbName, conn->pguser)))
conn->pgpass = tmp;
else else
conn->pgpass = strdup(DefaultPassword); conn->pgpass = strdup(DefaultPassword);