From 2fb0a219f61247677cfe32951bb9ab569231dc0b Mon Sep 17 00:00:00 2001
From: Michael Albinus <michael.albinus@gmx.de>
Date: Wed, 18 May 2011 14:59:25 +0200
Subject: [PATCH] * net/tramp.el (tramp-process-actions): Set
 "first-password-request" property for the correct connection in case of
 multihops.

---
 lisp/ChangeLog    |  5 +++++
 lisp/net/tramp.el | 29 +++++++++++++++++------------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index be5312a6f2b..15bd4b190b2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-18  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/tramp.el (tramp-process-actions): Set "first-password-request"
+	property for the correct connection in case of multihops.
+
 2011-05-18  Glenn Morris  <rgm@gnu.org>
 
 	* emacs-lisp/authors.el (authors-fixed-entries): Remove fakemail.c.
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index bc831c3b596..537ccf6da6a 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -3105,8 +3105,13 @@ set, is the starting point of the region to be deleted in the
 connection buffer."
   ;; Preserve message for `progress-reporter'.
   (tramp-compat-with-temp-message ""
-    ;; Enable auth-source and password-cache.
-    (tramp-set-connection-property vec "first-password-request" t)
+    ;; Enable auth-source and password-cache.  We must use
+    ;; tramp-current-* variables in case we have several hops.
+    (tramp-set-connection-property
+     (tramp-dissect-file-name
+      (tramp-make-tramp-file-name
+       tramp-current-method tramp-current-user tramp-current-host ""))
+     "first-password-request" t)
     (save-restriction
       (let (exit)
 	(while (not exit)
@@ -3544,16 +3549,16 @@ Invokes `password-read' if available, `read-passwd' else."
 		;; Try with Tramp's current method.
                 (if (fboundp 'auth-source-search)
 		    (setq auth-info
-                            (tramp-compat-funcall
-                             'auth-source-search
-                             :max 1
-                             :user (or tramp-current-user t)
-                             :host tramp-current-host
-                             :port tramp-current-method)
-			    auth-passwd (plist-get (nth 0 auth-info) :secret)
-			    auth-passwd (if (functionp auth-passwd)
-                                            (funcall auth-passwd)
-                                          auth-passwd))
+			  (tramp-compat-funcall
+			   'auth-source-search
+			   :max 1
+			   :user (or tramp-current-user t)
+			   :host tramp-current-host
+			   :port tramp-current-method)
+			  auth-passwd (plist-get (nth 0 auth-info) :secret)
+			  auth-passwd (if (functionp auth-passwd)
+					  (funcall auth-passwd)
+					auth-passwd))
                   (tramp-compat-funcall
                    'auth-source-user-or-password
                    "password" tramp-current-host tramp-current-method)))
-- 
2.11.4.GIT