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.

git-svn-id: svn://svn.tartarus.org/sgt/putty@5078 cda61777-01e9-0310-a592-d414129be87e

diff --git a/ssh.c b/ssh.c
index 25b7414..736c1fb 100644 (file)
--- a/ssh.c
+++ b/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;