Improve user retrieval from auth-source in Tramp

* lisp/net/tramp.el (tramp-read-passwd, tramp-clear-passwd):
Use user for auth-source request only in case it exists.

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 52a4be863c7c8eb6f657398ff868f0a86de0e535..af08cf7e13aa040579394e0144b7bf491118818f 100644 (file)
--- 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 ""))))