From 9cbaacd6738ad31592d468bb62247031497becb0 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Thu, 9 Aug 2001 21:22:38 +0000 Subject: [PATCH] Stop yelling about Access Denied if the server refuses even to attempt keyboard-interactive authentication. We can yell about it if we make a creditable attempt and are rejected, but if the server just refuses to even consider it then the user won't really want to know (and if they do there's the Event Log). [originally from svn r1180] --- ssh.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ssh.c b/ssh.c index f6828ddf..5471e535 100644 --- a/ssh.c +++ b/ssh.c @@ -3318,7 +3318,8 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt) AUTH_TYPE_PUBLICKEY_OFFER_LOUD, AUTH_TYPE_PUBLICKEY_OFFER_QUIET, AUTH_TYPE_PASSWORD, - AUTH_TYPE_KEYBOARD_INTERACTIVE + AUTH_TYPE_KEYBOARD_INTERACTIVE, + AUTH_TYPE_KEYBOARD_INTERACTIVE_QUIET } type; static int gotit, need_pw, can_pubkey, can_passwd, can_keyb_inter; static int tried_pubkey_config, tried_agent, tried_keyb_inter; @@ -3534,6 +3535,8 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt) if (type == AUTH_TYPE_PUBLICKEY_OFFER_LOUD) c_write_str("Server refused our key\r\n"); logevent("Server refused public key"); + } else if (type == AUTH_TYPE_KEYBOARD_INTERACTIVE_QUIET) { + /* server declined keyboard-interactive; ignore */ } else { c_write_str("Access denied\r\n"); logevent("Access denied"); @@ -3577,7 +3580,7 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt) if (pktin.type == SSH2_MSG_USERAUTH_FAILURE) gotit = TRUE; logevent("Keyboard-interactive authentication refused"); - type = AUTH_TYPE_KEYBOARD_INTERACTIVE; + type = AUTH_TYPE_KEYBOARD_INTERACTIVE_QUIET; continue; }