procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tramp: Don't use a tempfile for ControlPath.

Browse source 
Fixes: debbugs:19702

* net/tramp.el (tramp-ssh-controlmaster-options): Don't use a
tempfile for ControlPath.
This commit is contained in:
Michael Albinus 2015-02-03 10:32:00 +01:00
parent 27e11c0185
commit d6fee01589
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2015-02-03 Michael Albinus <michael.albinus@gmx.de>
* net/tramp.el (tramp-ssh-controlmaster-options): Don't use a
tempfile for ControlPath. (Bug#19702)
2015-02-02 Michael Albinus <michael.albinus@gmx.de>
* net/tramp.el (tramp-ssh-controlmaster-options): Use "%C" for

5
lisp/net/tramp.el
View file

@ -323,8 +323,9 @@ useful only in combination with `tramp-default-proxies-alist'.")
"ssh" nil t nil "-o" "ControlPath=%C" "host.does.not.exist")
(goto-char (point-min))
(if (search-forward-regexp "unknown.+key" nil t)
(setq result (concat result " -o ControlPath=%t.%%r@%%h:%%p"))
(setq result (concat result " -o ControlPath=%t.%%C"))))
(setq result
(concat result " -o ControlPath=tramp.%%r@%%h:%%p"))
(setq result (concat result " -o ControlPath=tramp.%%C"))))
(with-temp-buffer
(call-process "ssh" nil t nil "-o" "ControlPersist")
(goto-char (point-min))