diff options
| -rw-r--r-- | lisp/net/tramp.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 52a4be863c7..af08cf7e13a 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -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 "")))) |