upstream

3 files changed, 42 insertions, 21 deletions

diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el
index 03a5fe5b88e..d222dd1011d 100644
--- a/lisp/net/tramp-cache.el
+++ b/lisp/net/tramp-cache.el
@@ -243,7 +243,7 @@ PROPERTY is set persistent when KEY is a vector."
     (aset key 3 nil))
   (let ((hash (or (gethash key tramp-cache-data)
                   (puthash key (make-hash-table :test 'equal)
-                            tramp-cache-data))))
+                           tramp-cache-data))))
     (puthash property value hash)
     (setq tramp-cache-data-changed t)
     (tramp-message key 7 "%s %s" property value)
@@ -329,10 +329,15 @@ KEY identifies the connection, it is either a process or a vector."
                tramp-cache-data-changed
                (stringp tramp-persistency-file-name))
       (let ((cache (copy-hash-table tramp-cache-data)))
-        ;; Remove temporary data.
+        ;; Remove temporary data.  If there is the key "login-as", we
+        ;; don't save either, because all other properties might
+        ;; depend on the login name, and we want to give the
+        ;; possibility to use another login name later on.
         (maphash
          (lambda (key value)
-           (if (and (vectorp key) (not (tramp-file-name-localname key)))
+           (if (and (vectorp key)
+                    (not (tramp-file-name-localname key))
+                    (not (gethash "login-as" value)))
                (progn
                  (remhash "process-name" value)
                  (remhash "process-buffer" value)
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 2478253841f..38e19730a6d 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -380,7 +380,7 @@ detected as prompt when being sent on echoing hosts, therefore.")
     (tramp-remote-shell         "/bin/sh")
     (tramp-remote-shell-args    ("-c"))
     (tramp-copy-program         "pscp")
-    (tramp-copy-args            (("-P" "%p") ("-scp") ("-p" "%k")
+    (tramp-copy-args            (("-l" "%u") ("-P" "%p") ("-scp") ("-p" "%k")
                                  ("-q") ("-r")))
     (tramp-copy-keep-date       t)
     (tramp-copy-recursive       t)
@@ -394,7 +394,7 @@ detected as prompt when being sent on echoing hosts, therefore.")
     (tramp-remote-shell         "/bin/sh")
     (tramp-remote-shell-args    ("-c"))
     (tramp-copy-program         "pscp")
-    (tramp-copy-args            (("-P" "%p") ("-sftp") ("-p" "%k")
+    (tramp-copy-args            (("-l" "%u") ("-P" "%p") ("-sftp") ("-p" "%k")
                                  ("-q") ("-r")))
     (tramp-copy-keep-date       t)
     (tramp-copy-recursive       t)
@@ -419,13 +419,12 @@ detected as prompt when being sent on echoing hosts, therefore.")
              `(,(concat "\\`" (regexp-opt '("su" "sudo" "ksu")) "\\'")
                nil "root"))
 ;; Do not add "ssh" based methods, otherwise ~/.ssh/config would be ignored.
+;; Do not add "plink" based methods, they ask interactively for the user.
 ;;;###tramp-autoload
 (add-to-list 'tramp-default-user-alist
              `(,(concat
                  "\\`"
-                 (regexp-opt
-                  '("rcp" "remcp" "rsh" "telnet" "krlogin"
-                    "plink" "plink1" "pscp" "psftp" "fcp"))
+                 (regexp-opt '("rcp" "remcp" "rsh" "telnet" "krlogin" "fcp"))
                  "\\'")
                nil ,(user-login-name)))
 
@@ -2281,8 +2280,10 @@ The method used must be an out-of-band method."
         ;; Set variables for computing the prompt for reading
         ;; password.
         (setq tramp-current-method (tramp-file-name-method v)
-              tramp-current-user   (tramp-file-name-user v)
-              tramp-current-host   (tramp-file-name-real-host v))
+              tramp-current-user (or (tramp-file-name-user v)
+                                     (tramp-get-connection-property
+                                      v "login-as" nil))
+              tramp-current-host (tramp-file-name-real-host v))
 
         ;; Expand hops.  Might be necessary for gateway methods.
         (setq v (car (tramp-compute-multi-hops v)))
@@ -2309,8 +2310,15 @@ The method used must be an out-of-band method."
           (setq port (string-to-number (match-string 2 host))
                 host (string-to-number (match-string 1 host))))
 
+        ;; Check for user.  There might be an interactive setting.
+        (setq user (or (tramp-file-name-user v)
+                       (tramp-get-connection-property v "login-as" nil)))
+
         ;; Compose copy command.
-        (setq spec (format-spec-make
+        (setq host (or host "")
+              user (or user "")
+              port (or port "")
+              spec (format-spec-make
                     ?h host ?u user ?p port
                     ?t (tramp-get-connection-property
                         (tramp-get-connection-process v) "temp-file" "")
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index afb7ab4312b..f13315bc662 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -460,6 +460,12 @@ usually suffice.")
   "Regexp which matches `tramp-echo-mark' as it gets echoed by
 the remote shell.")
 
+(defcustom tramp-local-end-of-line
+  (if (memq system-type '(windows-nt)) "\r\n" "\n")
+  "*String used for end of line in local processes."
+  :group 'tramp
+  :type 'string)
+
 (defcustom tramp-rsh-end-of-line "\n"
   "*String used for end of line in rsh connections.
 I don't think this ever needs to be changed, so please tell me about it
@@ -1902,7 +1908,7 @@ Falls back to normal file name handler if no Tramp file name handler exists."
                   ;; operations shall return at least a default value
                   ;; in order to give the user a chance to correct the
                   ;; file name in the minibuffer.
-                  ;; We cannot use 'debug as error handler.  In order
+                  ;; We cannot use `debug' as error handler.  In order
                   ;; to get a full backtrace, one could apply
                   ;;   (setq debug-on-error t debug-on-signal t)
                   (error
@@ -3109,14 +3115,16 @@ beginning of local filename are not substituted."
 (defun tramp-action-login (proc vec)
   "Send the login name."
   (when (not (stringp tramp-current-user))
-    (save-window-excursion
-      (let ((enable-recursive-minibuffers t))
-        (pop-to-buffer (tramp-get-connection-buffer vec))
-        (setq tramp-current-user (read-string (match-string 0))))))
-  (tramp-message vec 3 "Sending login name `%s'" tramp-current-user)
+    (setq tramp-current-user
+          (with-connection-property vec "login-as"
+            (save-window-excursion
+              (let ((enable-recursive-minibuffers t))
+                (pop-to-buffer (tramp-get-connection-buffer vec))
+                (read-string (match-string 0)))))))
   (with-current-buffer (tramp-get-connection-buffer vec)
     (tramp-message vec 6 "\n%s" (buffer-string)))
-  (tramp-send-string vec tramp-current-user))
+  (tramp-message vec 3 "Sending login name `%s'" tramp-current-user)
+  (tramp-send-string vec (concat tramp-current-user tramp-local-end-of-line)))
 
 (defun tramp-action-password (proc vec)
   "Query the user for a password."
@@ -3148,7 +3156,7 @@ See also `tramp-action-yn'."
         (throw 'tramp-action 'permission-denied))
       (with-current-buffer (tramp-get-connection-buffer vec)
         (tramp-message vec 6 "\n%s" (buffer-string)))
-      (tramp-send-string vec "yes"))))
+      (tramp-send-string vec (concat "yes" tramp-local-end-of-line)))))
 
 (defun tramp-action-yn (proc vec)
   "Ask the user for confirmation using `y-or-n-p'.
@@ -3162,7 +3170,7 @@ See also `tramp-action-yesno'."
         (throw 'tramp-action 'permission-denied))
       (with-current-buffer (tramp-get-connection-buffer vec)
         (tramp-message vec 6 "\n%s" (buffer-string)))
-      (tramp-send-string vec "y"))))
+      (tramp-send-string vec (concat "y" tramp-local-end-of-line)))))
 
 (defun tramp-action-terminal (proc vec)
   "Tell the remote host which terminal type to use.
@@ -3170,7 +3178,7 @@ The terminal type can be configured with `tramp-terminal-type'."
   (tramp-message vec 5 "Setting `%s' as terminal type." tramp-terminal-type)
   (with-current-buffer (tramp-get-connection-buffer vec)
     (tramp-message vec 6 "\n%s" (buffer-string)))
-  (tramp-send-string vec tramp-terminal-type))
+  (tramp-send-string vec (concat tramp-terminal-type tramp-local-end-of-line)))
 
 (defun tramp-action-process-alive (proc vec)
   "Check, whether a process has finished."