No \\connect with usernames AND passwords.

bmomjian · bmomjian · commit 2d7023c8fb83 · 1997-09-12T21:58:03.000Z
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.93 1997/09/08 21:50:14 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.94 1997/09/12 21:58:03 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -1009,6 +1009,8 @@ do_connect(const char *new_dbname,`
`1009`	`1009`	`{`
`1010`	`1010`	`if (!new_dbname)`
`1011`	`1011`	`fprintf(stderr, "\\connect must be followed by a database name\n");`
	`1012`	`+ else if (new_user != NULL && settings.getPassword)`
	`1013`	`+ fprintf(stderr, "You can't specify a username when using passwords.\n");`
`1012`	`1014`	`else`
`1013`	`1015`	`{`
`1014`	`1016`	`PGconn *olddb = settings->db;`