mirror of
https://github.com/postgres/postgres.git
synced 2025-07-28 23:42:10 +03:00
Allow pg_ctl to determine the server is up when getting a request for a
password. Make password error message a #define and use it consistently. Sean Chittenden
This commit is contained in:
@ -5,7 +5,7 @@
|
||||
* Implements the basic DB functions used by the archiver.
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_db.c,v 1.59 2004/10/01 17:25:55 tgl Exp $
|
||||
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_db.c,v 1.60 2004/10/16 03:10:15 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -168,7 +168,7 @@ _connectDB(ArchiveHandle *AH, const char *reqdb, const char *requser)
|
||||
if (PQstatus(newConn) == CONNECTION_BAD)
|
||||
{
|
||||
noPwd = (strcmp(PQerrorMessage(newConn),
|
||||
"fe_sendauth: no password supplied\n") == 0);
|
||||
PQnoPasswordSupplied) == 0);
|
||||
badPwd = (strncmp(PQerrorMessage(newConn),
|
||||
"Password authentication failed for user", 39) == 0);
|
||||
|
||||
@ -249,7 +249,7 @@ ConnectDatabase(Archive *AHX,
|
||||
die_horribly(AH, modulename, "failed to connect to database\n");
|
||||
|
||||
if (PQstatus(AH->connection) == CONNECTION_BAD &&
|
||||
strcmp(PQerrorMessage(AH->connection), "fe_sendauth: no password supplied\n") == 0 &&
|
||||
strcmp(PQerrorMessage(AH->connection), PQnoPasswordSupplied) == 0 &&
|
||||
!feof(stdin))
|
||||
{
|
||||
PQfinish(AH->connection);
|
||||
|
Reference in New Issue
Block a user