Index: src/interfaces/libpq/fe-connect.c
===================================================================
RCS file: /cvsroot/pgsql-server/src/interfaces/libpq/fe-connect.c,v
retrieving revision 1.220
diff -c -c -r1.220 fe-connect.c
*** src/interfaces/libpq/fe-connect.c	8 Jan 2003 16:21:53 -0000	1.220
--- src/interfaces/libpq/fe-connect.c	8 Jan 2003 21:28:52 -0000
***************
*** 314,319 ****
--- 314,322 ----
  	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,519 ****
  		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);
  
--- 514,519 ----