aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2012-08-15 19:04:52 -0400
committerBruce Momjian <bruce@momjian.us>2012-08-15 19:05:05 -0400
commitfe21fcaf8d91a71c15ff25276f9fa81e0cd1dba9 (patch)
treec6d5fd6b2095d3e52cc9212f39c9690fe65989ee
parent4c5316931f2ec6b47aa4b98e2c3ca704907aca24 (diff)
downloadpostgresql-fe21fcaf8d91a71c15ff25276f9fa81e0cd1dba9.tar.gz
postgresql-fe21fcaf8d91a71c15ff25276f9fa81e0cd1dba9.zip
In psql, if the is no connection object, e.g. due to a server crash,
require all parameters for \c, rather than using the defaults, which might be wrong.
-rw-r--r--src/bin/psql/command.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index 6ead800aeb1..2cd3ab4cf72 100644
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -1512,6 +1512,12 @@ do_connect(char *dbname, char *user, char *host, char *port)
*n_conn;
char *password = NULL;
+ if (!o_conn && (!dbname || !user || !host || !port))
+ {
+ fputs(_("All connection parameters must be supplied because no database connection exists\n"), stderr);
+ return false;
+ }
+
if (!dbname)
dbname = PQdb(o_conn);
if (!user)