1
0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-05 13:32:48 -05:00

Attempt to report the error condition right when an SCP connection

with a pre-supplied password fails to authenticate.

[originally from svn r1114]
This commit is contained in:
Simon Tatham
2001-05-13 11:15:16 +00:00
parent 5723ec04de
commit e45f75a2be
2 changed files with 43 additions and 3 deletions

13
ssh.c
View File

@ -2018,7 +2018,10 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt)
* because one was supplied on the command line
* which has already failed to work). Terminate.
*/
logevent("No more passwords to try");
send_packet(SSH1_MSG_DISCONNECT,
PKT_STR, "No more passwords available to try",
PKT_END);
connection_fatal("Unable to authenticate");
ssh_state = SSH_STATE_CLOSED;
crReturn(1);
}
@ -3537,7 +3540,13 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt)
* command line which has already failed to
* work). Terminate.
*/
logevent("No more passwords to try");
ssh2_pkt_init(SSH2_MSG_DISCONNECT);
ssh2_pkt_adduint32(SSH2_DISCONNECT_BY_APPLICATION);
ssh2_pkt_addstring
("No more passwords available to try");
ssh2_pkt_addstring("en"); /* language tag */
ssh2_pkt_send();
connection_fatal("Unable to authenticate");
ssh_state = SSH_STATE_CLOSED;
crReturnV;
}