Simon points out that r5068 broke keyboard-interactive with multiple

INFO_REQUESTs, and for some reason Debian OpenSSH is sending INFO_REQUESTs
containing no prompts after a normal password authentication, so this
should fix Shai's problem.

[originally from svn r5078]
[r5068 == 297ee2573e]
[this svn revision also touched putty-wishlist]

ssh.c

@@ -6461,7 +6461,8 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen,
 		}
 	    }
 
-	    if (!s->method && s->can_keyb_inter && !s->kbd_inter_refused) {
+	    if (!s->method && s->can_keyb_inter && !s->kbd_inter_refused &&
+		!s->kbd_inter_running) {
 		s->method = AUTH_KEYBOARD_INTERACTIVE;
 		s->type = AUTH_TYPE_KEYBOARD_INTERACTIVE;