Tramp: Don't use a tempfile for ControlPath.

Fixes: debbugs:19702
* net/tramp.el (tramp-ssh-controlmaster-options): Don't use a
tempfile for ControlPath.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8ef533e1aa6a8387e555f1c5ba72e7bcffa225a9..a61c2403dd3522b46ae066c5f383daba93090509 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index c442806b90f7cf31f4a9e9cd3a78eb56a7afd477..b746bca58045d09e1de86d1d76c9439e93461bd8 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -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))