From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 12 Sep 1997 21:58:03 +0000 (+0000)
Subject: No \\connect with usernames AND passwords.
X-Git-Tag: REL6_2~210
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2d7023c8fb8367850470438292ae83a6471848ae;p=thirdparty%2Fpostgresql.git

No \\connect with usernames AND passwords.
---

diff --git a/src/bin/psql/psql.c b/src/bin/psql/psql.c
index f2ab13da5da..1933883df8d 100644
--- a/src/bin/psql/psql.c
+++ b/src/bin/psql/psql.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.93 1997/09/08 21:50:14 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.94 1997/09/12 21:58:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1009,6 +1009,8 @@ do_connect(const char *new_dbname,
 {
 	if (!new_dbname)
 		fprintf(stderr, "\\connect must be followed by a database name\n");
+	else if (new_user != NULL && settings.getPassword)
+		fprintf(stderr, "You can't specify a username when using passwords.\n");
 	else
 	{
 		PGconn	   *olddb = settings->db;