|
8 | 8 | * |
9 | 9 | * |
10 | 10 | * IDENTIFICATION |
11 | | - * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.220 2003/01/0816:21:53 momjian Exp $ |
| 11 | + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.221 2003/01/08 21:33:27 momjian Exp $ |
12 | 12 | * |
13 | 13 | *------------------------------------------------------------------------- |
14 | 14 | */ |
@@ -314,6 +314,9 @@ PQconnectStart(const char *conninfo) |
314 | 314 | conn->pguser=tmp ?strdup(tmp) :NULL; |
315 | 315 | tmp=conninfo_getval(connOptions,"password"); |
316 | 316 | conn->pgpass=tmp ?strdup(tmp) :NULL; |
| 317 | +if (conn->pgpass==NULL||conn->pgpass[0]=='\0') |
| 318 | +conn->pgpass=PasswordFromFile(conn->pghost,conn->pgport, |
| 319 | +conn->dbName,conn->pguser); |
317 | 320 | tmp=conninfo_getval(connOptions,"connect_timeout"); |
318 | 321 | conn->connect_timeout=tmp ?strdup(tmp) :NULL; |
319 | 322 | #ifdefUSE_SSL |
@@ -511,9 +514,6 @@ PQsetdbLogin(const char *pghost, const char *pgport, const char *pgoptions, |
511 | 514 | conn->pgpass=strdup(pwd); |
512 | 515 | elseif ((tmp=getenv("PGPASSWORD"))!=NULL) |
513 | 516 | conn->pgpass=strdup(tmp); |
514 | | -elseif ((tmp=PasswordFromFile(conn->pghost,conn->pgport, |
515 | | -conn->dbName,conn->pguser))) |
516 | | -conn->pgpass=tmp; |
517 | 517 | else |
518 | 518 | conn->pgpass=strdup(DefaultPassword); |
519 | 519 |
|
|