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

Improve user retrieval from auth-source in Tramp

Browse source 
* lisp/net/tramp.el (tramp-read-passwd, tramp-clear-passwd):
Use user for auth-source request only in case it exists.
This commit is contained in:
Michael Albinus 2016-11-29 15:51:38 +01:00
parent e42b964c12
commit bb4212d10b
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/net/tramp.el
View file

@ -4218,7 +4218,8 @@ Invokes `password-read' if available, `read-passwd' else."
(setq auth-info
(auth-source-search
:max 1
:user (or tramp-current-user t)
(and tramp-current-user :user)
tramp-current-user
:host tramp-current-host
:port tramp-current-method
:require
@ -4262,7 +4263,7 @@ Invokes `password-read' if available, `read-passwd' else."
;; since Emacs 24.1, it has been replaced by `auth-source-forget'.
(if (fboundp 'auth-source-forget)
(auth-source-forget
`(:max 1 :user ,(or user t) :host ,host :port ,method))
`(:max 1 ,(and user :user) ,user :host ,host :port ,method))
(tramp-compat-funcall
'auth-source-forget-user-or-password "password" host method))
(password-cache-remove (tramp-make-tramp-file-name method user host ""))))