Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-23 13:27:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use 0.0.0.1 as test host in Tramp

Browse source 
* lisp/net/tramp-sh.el (tramp-ssh-controlmaster-options):
Use 0.0.0.1 as test host.
This commit is contained in:
Michael Albinus 2015-07-22 07:54:48 +02:00
parent 5abadebc35
commit 4f855d6fc9
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lisp/net/tramp-sh.el
View file

@ -4614,19 +4614,15 @@ Gateway hops are already opened."
(setq tramp-ssh-controlmaster-options "-o ControlMaster=auto")))
(unless (zerop (length tramp-ssh-controlmaster-options))
(with-temp-buffer
;; When we use a non-existing host name, we could run
;; into DNS timeouts. So we use "localhost" with an
;; improper port, expecting nobody runs sshd on the
;; telnet port.
;; We use a non-existing IP address, in order to avoid
;; useless connections, and DNS timeouts.
(tramp-call-process
vec "ssh" nil t nil
"-p" "23" "-o" "ControlPath=%C" "localhost")
vec "ssh" nil t nil "-o" "ControlPath=%C" "0.0.0.1")
(goto-char (point-min))
(setq tramp-ssh-controlmaster-options
(if (search-forward-regexp "unknown.+key" nil t)
(concat tramp-ssh-controlmaster-options
" -o ControlPath='tramp.%%r@%%h:%%p'")
(concat tramp-ssh-controlmaster-options
(concat tramp-ssh-controlmaster-options
(if (search-forward-regexp "unknown.+key" nil t)
" -o ControlPath='tramp.%%r@%%h:%%p'"
" -o ControlPath='tramp.%%C'"))))
(with-temp-buffer
(tramp-call-process vec "ssh" nil t nil "-o" "ControlPersist")