Re: tramp (2.1.18-23.2); Both prompts are for "passphrase" when using publickey,password authenticators

[Michael Albinus]

address@hidden (Trent W. Buck) writes:

> I type C-x C-f /fs: RET, which prompts me for
>
>     Passphrase for /scp:fs:
>
> Since I haven't enabled ssh-agent, and I don't WANT to use my ssh key
> this time, I type ^M without entering a passphrase.  (In ssh, I'd type
> ^D, but that doesn't work in tramp).
>
> SSH then correctly falls back to password authenticator, and I can type
> in the password for the address@hidden account.
>
> *BUT*, the passWORD prompt from tramp continues to say
>
>     Passphrase for /scp:fs:
>
> This is confusing and misleading, and I wish it didn't happen.

Could you, please, check the following patch:

--8<---------------cut here---------------start------------->8---
*** /home/albinus/src/tramp/lisp/tramp.el.~2.812.~      2010-08-10 
10:04:39.000000000 +0200
--- /home/albinus/src/tramp/lisp/tramp.el       2010-08-11 10:48:10.000000000 
+0200
***************
*** 6698,6705 ****
    "Query the user for a password."
    (with-current-buffer (process-buffer proc)
      (tramp-check-for-regexp proc tramp-password-prompt-regexp)
!     (tramp-message vec 3 "Sending %s" (match-string 1)))
!   (tramp-enter-password proc))

  (defun tramp-action-succeed (proc vec)
    "Signal success in finding shell prompt."
--- 6698,6707 ----
    "Query the user for a password."
    (with-current-buffer (process-buffer proc)
      (tramp-check-for-regexp proc tramp-password-prompt-regexp)
!     (tramp-message vec 3 "Sending %s" (match-string 1))
!     (tramp-enter-password proc)
!     ;; Hide password prompt.
!     (narrow-to-region (point-max) (point-max))))

  (defun tramp-action-succeed (proc vec)
    "Signal success in finding shell prompt."
***************
*** 6810,6815 ****
--- 6812,6818 ----
                      (tramp-process-one-action proc vec actions))
                  (tramp-process-one-action proc vec actions)))))
        (with-current-buffer (tramp-get-connection-buffer vec)
+       (widen)
        (tramp-message vec 6 "\n%s" (buffer-string)))
        (unless (eq exit 'ok)
        (tramp-clear-passwd vec)
--8<---------------cut here---------------end--------------->8---

Thanks for reporting, and best regards, Michael.