summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/net/tramp-sh.el2
-rw-r--r--lisp/net/tramp.el4
2 files changed, 4 insertions, 2 deletions
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 9b001a90e78..999de8e8504 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -4546,7 +4546,7 @@ Goes through the list `tramp-inline-compress-commands'."
;; host name.
(let* ((v (car target-alist))
(method (tramp-file-name-method v))
- (host (tramp-file-name-host v)))
+ (host (tramp-file-name-real-host v)))
(unless
(or
;; There are multi-hops.
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 5b1e478db04..70abb89194d 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -837,7 +837,7 @@ Used in `tramp-make-tramp-file-name'."
(defun tramp-postfix-host-regexp ()
"Regexp matching delimiter between host names and localnames.
-nDerived from `tramp-postfix-host-format'."
+Derived from `tramp-postfix-host-format'."
(regexp-quote (tramp-postfix-host-format)))
(defconst tramp-localname-regexp ".*$"
@@ -4396,6 +4396,8 @@ Only works for Bourne-like shells."
;; * Use also port to distinguish connections. This is needed for
;; different hosts sitting behind a single router (distinguished by
;; different port numbers). (Tzvi Edelman)
+;; Also needed for different systems serve SSH on different ports of
+;; the same IP address. (Bug#27009)
;;
;; * Refactor code from different handlers. Start with
;; *-process-file. One idea is to generalize `tramp-send-command'