Diff

Differences From Artifact [91ffa29901]:

To Artifact [e1db0e8234]:


2014
2015
2016
2017
2018
2019
2020

2021


2022
2023
2024
2025
2026
2027
2028
	if (ssh_get_line) {
	    if (!ssh_get_line(prompt, password, sizeof(password), TRUE)) {
		/*
		 * get_line failed to get a password (for example
		 * because one was supplied on the command line
		 * which has already failed to work). Terminate.
		 */

		logevent("No more passwords to try");


		ssh_state = SSH_STATE_CLOSED;
		crReturn(1);
	    }
	} else {
	    c_write_str(prompt);
	    pos = 0;
	    ssh_send_ok = 1;







>
|
>
>







2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
	if (ssh_get_line) {
	    if (!ssh_get_line(prompt, password, sizeof(password), TRUE)) {
		/*
		 * get_line failed to get a password (for example
		 * because one was supplied on the command line
		 * which has already failed to work). Terminate.
		 */
		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);
	    }
	} else {
	    c_write_str(prompt);
	    pos = 0;
	    ssh_send_ok = 1;
3533
3534
3535
3536
3537
3538
3539



3540



3541
3542
3543
3544
3545
3546
3547
				      sizeof(password), TRUE)) {
			/*
			 * get_line failed to get a password (for
			 * example because one was supplied on the
			 * command line which has already failed to
			 * work). Terminate.
			 */



			logevent("No more passwords to try");



			ssh_state = SSH_STATE_CLOSED;
			crReturnV;
		    }
		} else {
		    static int pos = 0;
		    static char c;








>
>
>
|
>
>
>







3536
3537
3538
3539
3540
3541
3542
3543
3544
3545
3546
3547
3548
3549
3550
3551
3552
3553
3554
3555
3556
				      sizeof(password), TRUE)) {
			/*
			 * get_line failed to get a password (for
			 * example because one was supplied on the
			 * command line which has already failed to
			 * work). Terminate.
			 */
			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;
		    }
		} else {
		    static int pos = 0;
		    static char c;