diff options
| -rw-r--r-- | lisp/net/tramp-sh.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index e61b0ce526a..9b001a90e78 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el | |||
| @@ -4592,8 +4592,10 @@ Goes through the list `tramp-inline-compress-commands'." | |||
| 4592 | (with-temp-buffer | 4592 | (with-temp-buffer |
| 4593 | ;; We use a non-existing IP address, in order to | 4593 | ;; We use a non-existing IP address, in order to |
| 4594 | ;; avoid useless connections, and DNS timeouts. | 4594 | ;; avoid useless connections, and DNS timeouts. |
| 4595 | ;; Setting ConnectTimeout is needed since OpenSSH 7. | ||
| 4595 | (tramp-call-process | 4596 | (tramp-call-process |
| 4596 | vec "ssh" nil t nil "-o" "ControlPath=%C" "0.0.0.1") | 4597 | vec "ssh" nil t nil |
| 4598 | "-o" "ConnectTimeout=1" "-o" "ControlPath=%C" "0.0.0.1") | ||
| 4597 | (goto-char (point-min)) | 4599 | (goto-char (point-min)) |
| 4598 | (setq tramp-ssh-controlmaster-options | 4600 | (setq tramp-ssh-controlmaster-options |
| 4599 | (concat tramp-ssh-controlmaster-options | 4601 | (concat tramp-ssh-controlmaster-options |