[Emacs-diffs] emacs-24 d6fee01: Tramp: Don't use a tempfile for ControlPath.

[Michael Albinus]

branch: emacs-24
commit d6fee01589a0f10b3d761bd9bdf582730c92a171
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>

    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.
---
 lisp/ChangeLog    |    5 +++++
 lisp/net/tramp.el |    5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8ef533e..a61c240 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-03  Michael Albinus  <address@hidden>
+
+       * net/tramp.el (tramp-ssh-controlmaster-options): Don't use a
+       tempfile for ControlPath.  (Bug#19702)
+
 2015-02-02  Michael Albinus  <address@hidden>
 
        * net/tramp.el (tramp-ssh-controlmaster-options): Use "%C" for
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index c442806..b746bca 100644
--- 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 address@hidden:%%p"))
-             (setq result (concat result " -o ControlPath=%t.%%C"))))
+               (setq result
+                     (concat result " -o address@hidden:%%p"))
+             (setq result (concat result " -o ControlPath=tramp.%%C"))))
          (with-temp-buffer
            (call-process "ssh" nil t nil "-o" "ControlPersist")
            (goto-char (point-min))