Diff

Differences From Artifact [bd0b31d576]:

To Artifact [91e884a6ce]:


3708
3709
3710
3711
3712
3713
3714

3715
3716
3717
3718
3719
3720
3721
3722






3723

3724
3725
3726
3727
3728
3729
3730
3708
3709
3710
3711
3712
3713
3714
3715
3716
3717
3718
3719
3720
3721
3722
3723
3724
3725
3726
3727
3728
3729

3730
3731
3732
3733
3734
3735
3736
3737







+








+
+
+
+
+
+
-
+







     *  - people with a key held in Pageant, who might not have
     *    logged in to a particular machine before; so they want to
     *    type a username, and then _either_ their key will be
     *    accepted, _or_ they will type a password. If they mistype
     *    the username they will want to be able to get back and
     *    retype it!
     */
    username[0] = '\0';
    do {
	static int pos;
	static char c;

	/*
	 * Get a username.
	 */
	pos = 0;
	if (*username && !cfg.change_username) {
	    /*
	     * We got a username last time round this loop, and
	     * with change_username turned off we don't try to get
	     * it again.
	     */
	if ((flags & FLAG_INTERACTIVE) && !*cfg.username) {
	} else if ((flags & FLAG_INTERACTIVE) && !*cfg.username) {
	    if (ssh_get_line) {
		if (!ssh_get_line("login as: ",
				  username, sizeof(username), FALSE)) {
		    /*
		     * get_line failed to get a username.
		     * Terminate.
		     */