Improve result of `auth-source-search' in Tramp

* lisp/net/tramp.el (tramp-read-passwd): Require :secret and
:user in result of `auth-source-search'.

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 730972e0c4eb6a1df7b1f501a9fac255457f202f..e03b614b3f413e594b42b9a01543708c7b65325d 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -4160,7 +4160,10 @@ Invokes `password-read' if available, `read-passwd' else."
                                 :max 1
                                 :user (or tramp-current-user t)
                                 :host tramp-current-host
-                                :port tramp-current-method)
+                                :port tramp-current-method
+                                :require
+                                (cons
+                                 :secret (and tramp-current-user '(:user))))
                                auth-passwd (plist-get
                                             (nth 0 auth-info) :secret)
                                auth-passwd (if (functionp auth-passwd)