diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2004-09-10 20:05:18 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2004-09-10 20:05:18 +0000 |
| commit | 1d681d6cee36301cf31696221d1ed011e2edbdc9 (patch) | |
| tree | feb90d2d66053e86972cdd2f43e6df3968674d4f /src/bin/pg_dump/pg_backup_db.c | |
| parent | b339d1fff6c2f14776af29a35c8550b222ca70b2 (diff) | |
| download | postgresql-1d681d6cee36301cf31696221d1ed011e2edbdc9.tar.gz | |
Fix some problems with restoring databases owned by non-superusers,
as per bug #1249; and remove the last vestiges of using \connect to
change authorization.
Diffstat (limited to 'src/bin/pg_dump/pg_backup_db.c')
| -rw-r--r-- | src/bin/pg_dump/pg_backup_db.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/bin/pg_dump/pg_backup_db.c b/src/bin/pg_dump/pg_backup_db.c index 1489bfbc16..360e41b1f9 100644 --- a/src/bin/pg_dump/pg_backup_db.c +++ b/src/bin/pg_dump/pg_backup_db.c @@ -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.57 2004/08/29 05:06:53 momjian Exp $ + * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_db.c,v 1.58 2004/09/10 20:05:18 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -88,8 +88,8 @@ _check_database_version(ArchiveHandle *AH, bool ignoreVersion) * Reconnect to the server. If dbname is not NULL, use that database, * else the one associated with the archive handle. If username is * not NULL, use that user name, else the one from the handle. If - * both the database and the user and match the existing connection - * already, nothing will be done. + * both the database and the user match the existing connection already, + * nothing will be done. * * Returns 1 in any case. */ @@ -111,8 +111,8 @@ ReconnectToServer(ArchiveHandle *AH, const char *dbname, const char *username) newusername = username; /* Let's see if the request is already satisfied */ - if (strcmp(newusername, PQuser(AH->connection)) == 0 - && strcmp(newdbname, PQdb(AH->connection)) == 0) + if (strcmp(newdbname, PQdb(AH->connection)) == 0 && + strcmp(newusername, PQuser(AH->connection)) == 0) return 1; newConn = _connectDB(AH, newdbname, newusername); |