diff options
| author | Bruce Momjian <bruce@momjian.us> | 2003-01-08 21:33:53 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2003-01-08 21:33:53 +0000 |
| commit | c8b0ab0bd32ebc55942180c35e27cee191d96ee6 (patch) | |
| tree | 7cb73aacc4ae2804b8b3a990b626612e2ea5f799 /src | |
| parent | 40cb1361a624363b8f64728a58aac426ba88dbb9 (diff) | |
| download | postgresql-c8b0ab0bd32ebc55942180c35e27cee191d96ee6.tar.gz postgresql-c8b0ab0bd32ebc55942180c35e27cee191d96ee6.zip | |
Fix pgpass to work with PQconnectDB().
Backpatch to 7.3.X.
Report from ljb.
Diffstat (limited to 'src')
| -rw-r--r-- | src/interfaces/libpq/fe-connect.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index 7cdd2466624..3a64ec1748a 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -8,7 +8,7 @@ * * * 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; tmp = conninfo_getval(connOptions, "password"); 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"); conn->connect_timeout = tmp ? strdup(tmp) : NULL; #ifdef USE_SSL @@ -501,9 +504,6 @@ PQsetdbLogin(const char *pghost, const char *pgport, const char *pgoptions, conn->pgpass = strdup(pwd); else if ((tmp = getenv("PGPASSWORD")) != NULL) conn->pgpass = strdup(tmp); - else if ((tmp = PasswordFromFile(conn->pghost, conn->pgport, - conn->dbName, conn->pguser))) - conn->pgpass = tmp; else conn->pgpass = strdup(DefaultPassword); |