diff options
| author | Bruce Momjian <bruce@momjian.us> | 2003-01-08 21:33:27 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2003-01-08 21:33:27 +0000 |
| commit | fe7f8f2b91a587360bcdcb4b9371980bb2c1cf54 (patch) | |
| tree | 0b7557223ed62e5eec44ed538f8a6447e12060ef | |
| parent | cbca6c4896e4102a67988cbe1811afa9a45d8b5f (diff) | |
| download | postgresql-fe7f8f2b91a587360bcdcb4b9371980bb2c1cf54.tar.gz postgresql-fe7f8f2b91a587360bcdcb4b9371980bb2c1cf54.zip | |
Fix pgpass to work with PQconnectDB().
Backpatch to 7.3.X.
Report from ljb.
| -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 b5f566eb4f8..57108df1ff8 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.220 2003/01/08 16:21:53 momjian Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.221 2003/01/08 21:33:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -314,6 +314,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 @@ -511,9 +514,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); |