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

Fix ControlPath quoting in Tramp

Browse source 
* lisp/net/tramp-sh.el (tramp-ssh-controlmaster-options):
Adapt docstring.  Do not quote ControlPath.  Reported by Daniel
Kessler <kesslerd@umich.edu>.
This commit is contained in:
Michael Albinus 2022-05-12 15:46:20 +02:00
parent 7b4bdf7b9b
commit f03c5d81bd
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -115,7 +115,7 @@ configuration."
"Which ssh Control* arguments to use. "Which ssh Control* arguments to use.
If it is a string, it should have the form If it is a string, it should have the form
\"-o ControlMaster=auto -o ControlPath=\\='tramp.%%r@%%h:%%p\\=' \"-o ControlMaster=auto -o ControlPath=tramp.%%C
-o ControlPersist=no\". Percent characters in the ControlPath -o ControlPersist=no\". Percent characters in the ControlPath
spec must be doubled, because the string is used as format string. spec must be doubled, because the string is used as format string.
@ -4785,13 +4785,13 @@ Goes through the list `tramp-inline-compress-commands'."
(if (zerop (if (zerop
(tramp-call-process (tramp-call-process
vec "ssh" nil nil nil vec "ssh" nil nil nil
"-G" "-o" "ControlPath='tramp.%C'" "0.0.0.1")) "-G" "-o" "ControlPath=tramp.%C" "0.0.0.1"))
(setq tramp-ssh-controlmaster-options (setq tramp-ssh-controlmaster-options
(concat tramp-ssh-controlmaster-options (concat tramp-ssh-controlmaster-options
" -o ControlPath='tramp.%%C'")) " -o ControlPath=tramp.%%C"))
(setq tramp-ssh-controlmaster-options (setq tramp-ssh-controlmaster-options
(concat tramp-ssh-controlmaster-options (concat tramp-ssh-controlmaster-options
" -o ControlPath='tramp.%%r@%%h:%%p'"))) " -o ControlPath=tramp.%%r@%%h:%%p")))
(when (zerop (when (zerop
(tramp-call-process (tramp-call-process
vec "ssh" nil nil nil vec "ssh" nil nil nil