From: Michael Albinus <michael.albinus@gmx.de>
Date: Fri, 28 Oct 2016 15:08:14 +0000 (+0200)
Subject: Improve result of `auth-source-search' in Tramp
X-Git-Tag: emacs-26.0.90~1406
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f5543ffcf5b2974fa8fc6cf007e9109fa8e9051e;p=emacs.git

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 730972e0c4e..e03b614b3f4 100644
--- 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)