Differences From Artifact [17f0090ca7]:

• File ssh.c — part of check-in [5033091888] at 2005-11-04 08:49:22 on branch trunk — Fix for `ssh2-password-expiry'. Success case tested. (Much easier since r6437, and actually works to boot.) (user: jacob size: 258066)

To Artifact [3ecf5cc308]:

• File ssh.c — part of check-in [992b547918] at 2005-11-04 17:21:42 on branch trunk — Placate a compiler warning introduced in r6437. (I forgot we usually compile with -Werror on Unix, oops.) (user: jacob size: 258135)

3458
3459
3460
3461
3462
3463
3464


3465
3466
3467
3468
3469
3470
3471

		    got_passphrase = FALSE;
		    break;	       /* go and try something else */
		} else if (ret == -1) {
		    c_write_str(ssh, "Wrong passphrase.\r\n"); /* FIXME */
		    s->tried_publickey = 0;
		    got_passphrase = FALSE;
		    /* and try again */


		}
	    }

	    if (got_passphrase) {

		/*
		 * Send a public key attempt.

>
>

3458
3459
3460
3461
3462
3463
3464
3465
3466
3467
3468
3469
3470
3471
3472
3473

		    got_passphrase = FALSE;
		    break;	       /* go and try something else */
		} else if (ret == -1) {
		    c_write_str(ssh, "Wrong passphrase.\r\n"); /* FIXME */
		    s->tried_publickey = 0;
		    got_passphrase = FALSE;
		    /* and try again */
		} else {
		    assert(0 && "unexpected return from loadrsakey()");
		}
	    }

	    if (got_passphrase) {

		/*
		 * Send a public key attempt.