Commits

Anonymous committed 12ba80a

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).

Comments (0)

Files changed (1)

 	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;
 			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");
 		    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;
 		}