X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;ds=sidebyside;f=ssh.c;h=9f27e3a9c85fa0d50736e382a6ee46c1fe7f3125;hb=a65928a8aeca3a7995015f3b8691128f8f3d23b9;hp=bb8441afe906ade1c37a87c2dc5e27a2d82db38b;hpb=994bb17c57d78cb9e9457c641c4bd161393595a1;p=PuTTY.git

diff --git a/ssh.c b/ssh.c
index bb8441af..9f27e3a9 100644
--- a/ssh.c
+++ b/ssh.c
@@ -3712,6 +3712,7 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt)
      *    the username they will want to be able to get back and
      *    retype it!
      */
+    username[0] = '\0';
     do {
 	static int pos;
 	static char c;
@@ -3720,7 +3721,13 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt)
 	 * Get a username.
 	 */
 	pos = 0;
-	if ((flags & FLAG_INTERACTIVE) && !*cfg.username) {
+	if (*username && !cfg.change_username) {
+	    /*
+	     * We got a username last time round this loop, and
+	     * with change_username turned off we don't try to get
+	     * it again.
+	     */
+	} else if ((flags & FLAG_INTERACTIVE) && !*cfg.username) {
 	    if (ssh_get_line) {
 		if (!ssh_get_line("login as: ",
 				  username, sizeof(username), FALSE)) {
@@ -4864,12 +4871,25 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt)
 		 * See if that was the last channel left open.
 		 */
 		if (count234(ssh_channels) == 0) {
+#if 0
+                    /*
+                     * We used to send SSH_MSG_DISCONNECT here,
+                     * because I'd believed that _every_ conforming
+                     * SSH2 connection had to end with a disconnect
+                     * being sent by at least one side; apparently
+                     * I was wrong and it's perfectly OK to
+                     * unceremoniously slam the connection shut
+                     * when you're done, and indeed OpenSSH feels
+                     * this is more polite than sending a
+                     * DISCONNECT. So now we don't.
+                     */
 		    logevent("All channels closed. Disconnecting");
 		    ssh2_pkt_init(SSH2_MSG_DISCONNECT);
 		    ssh2_pkt_adduint32(SSH2_DISCONNECT_BY_APPLICATION);
 		    ssh2_pkt_addstring("All open channels closed");
 		    ssh2_pkt_addstring("en");	/* language tag */
 		    ssh2_pkt_send();
+#endif
 		    ssh_state = SSH_STATE_CLOSED;
 		    crReturnV;
 		}