diff options
Diffstat (limited to 'lisp/net/tramp-sh.el')
| -rw-r--r-- | lisp/net/tramp-sh.el | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 1fa358e9277..e50bb8498db 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -2280,7 +2280,7 @@ The method used must be an out-of-band method." ;; password. (setq tramp-current-method (tramp-file-name-method v) tramp-current-user (tramp-file-name-user v) - tramp-current-host (tramp-file-name-host v)) + 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))) @@ -4292,7 +4292,7 @@ connection if a previous connection has died for some reason." (gw (tramp-get-file-property hop "" "gateway" nil)) (g-method (and gw (tramp-file-name-method gw))) (g-user (and gw (tramp-file-name-user gw))) - (g-host (and gw (tramp-file-name-host gw))) + (g-host (and gw (tramp-file-name-real-host gw))) (command login-program) ;; We don't create the temporary file. In fact, ;; it is just a prefix for the ControlPath option @@ -4721,16 +4721,6 @@ This is used internally by `tramp-file-mode-from-int'." x)) remote-path))))) -(defun tramp-get-remote-tmpdir (vec) - (with-connection-property vec "tmp-directory" - (let ((dir (tramp-shell-quote-argument "/tmp"))) - (if (and (tramp-send-command-and-check - vec (format "%s -d %s" (tramp-get-test-command vec) dir)) - (tramp-send-command-and-check - vec (format "%s -w %s" (tramp-get-test-command vec) dir))) - dir - (tramp-error vec 'file-error "Directory %s not accessible" dir))))) - (defun tramp-get-ls-command (vec) (with-connection-property vec "ls" (tramp-message vec 5 "Finding a suitable `ls' command") |