Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
cb85dcd0
Commit
cb85dcd0
authored
Feb 01, 2009
by
Michael Albinus
Browse files
* net/tramp.el (tramp-read-passwd): Cached passwords shall still be used.
parent
18288ba7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
7 deletions
+20
-7
lisp/ChangeLog
lisp/ChangeLog
+11
-0
lisp/net/tramp.el
lisp/net/tramp.el
+9
-7
No files found.
lisp/ChangeLog
View file @
cb85dcd0
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.
...
...
lisp/net/tramp.el
View file @
cb85dcd0
...
...
@@ -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))))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment