procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* net/tramp.el (tramp-read-passwd): Cached passwords shall still be used.

Browse source
This commit is contained in:
Michael Albinus 2009-02-01 10:48:12 +00:00
parent 18288ba7ae
commit cb85dcd0dc
2 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lisp/ChangeLog
View file

@ -1,3 +1,14 @@
2009-02-01 Michael Albinus <michael.albinus@gmx.de>
Sync with Tramp 2.1.15.
* net/tramp.el (tramp-read-passwd): Cached passwords shall still be
used.
* net/tramp-cache.el (top): Autoload `tramp-run-real-handler'.
* net/trampver.el: Update release number.
2009-02-01 Stefan Monnier <monnier@iro.umontreal.ca>
* mail/rmail.el (rmail-view-buffer): Make buffer-local.

16
lisp/net/tramp.el
View file

@ -3664,7 +3664,7 @@ the result will be a local, non-Tramp, filename."
(buffer-substring (point) (tramp-compat-line-end-position)))))
(setq localname (concat uname fname))))
;; There might be a double slash, for example when "~/"
;; expands to "/". Remove this.
;; expands to "/". Remove this.
(while (string-match "//" localname)
(setq localname (replace-match "/" t t localname)))
;; No tilde characters in file name, do normal
@ -7433,12 +7433,14 @@ Invokes `password-read' if available, `read-passwd' else."
(funcall (symbol-function 'auth-source-user-or-password)
"password" tramp-current-host tramp-current-method))
;; Try the password cache.
(and (functionp 'password-read)
(tramp-get-connection-property proc "first-password-request" nil)
(let ((password (funcall (symbol-function 'password-read)
pw-prompt key)))
(funcall (symbol-function 'password-cache-add) key password)
password))
(when (functionp 'password-read)
(unless (tramp-get-connection-property
proc "first-password-request" nil)
(funcall (symbol-function 'password-cache-remove) key))
(let ((password
(funcall (symbol-function 'password-read) pw-prompt key)))
(funcall (symbol-function 'password-cache-add) key password)
password))
;; Else, get the password interactively.
(read-passwd pw-prompt))
(tramp-set-connection-property proc "first-password-request" nil))))