Commit a336b2ea authored by Michael Albinus's avatar Michael Albinus
Browse files

Fix Bug#17653.

* net/tramp.el (tramp-ssh-controlmaster-options): Improve search regexp.
parent e7477c9f
2014-06-03 Michael Albinus <michael.albinus@gmx.de>
* net/tramp.el (tramp-ssh-controlmaster-options): Improve search
regexp. (Bug#17653)
2014-06-03 Glenn Morris <rgm@gnu.org> 2014-06-03 Glenn Morris <rgm@gnu.org>
   
* emacs-lisp/package.el (package-pinned-packages): Doc fix. * emacs-lisp/package.el (package-pinned-packages): Doc fix.
......
...@@ -302,18 +302,19 @@ useful only in combination with `tramp-default-proxies-alist'.") ...@@ -302,18 +302,19 @@ useful only in combination with `tramp-default-proxies-alist'.")
;;;###tramp-autoload ;;;###tramp-autoload
(defconst tramp-ssh-controlmaster-options (defconst tramp-ssh-controlmaster-options
(let ((result "")) (let ((result "")
(case-fold-search t))
(ignore-errors (ignore-errors
(with-temp-buffer (with-temp-buffer
(call-process "ssh" nil t nil "-o" "ControlMaster") (call-process "ssh" nil t nil "-o" "ControlMaster")
(goto-char (point-min)) (goto-char (point-min))
(when (search-forward-regexp "Missing ControlMaster argument" nil t) (when (search-forward-regexp "missing.+argument" nil t)
(setq result "-o ControlPath=%t.%%r@%%h:%%p -o ControlMaster=auto"))) (setq result "-o ControlPath=%t.%%r@%%h:%%p -o ControlMaster=auto")))
(when result (unless (zerop (length result))
(with-temp-buffer (with-temp-buffer
(call-process "ssh" nil t nil "-o" "ControlPersist") (call-process "ssh" nil t nil "-o" "ControlPersist")
(goto-char (point-min)) (goto-char (point-min))
(when (search-forward-regexp "Missing ControlPersist argument" nil t) (when (search-forward-regexp "missing.+argument" nil t)
(setq result (concat result " -o ControlPersist=no")))))) (setq result (concat result " -o ControlPersist=no"))))))
result) result)
"Call ssh to detect whether it supports the Control* arguments. "Call ssh to detect whether it supports the Control* arguments.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment