Skip to content

Commit f03c5d8

Browse files
committed
Fix ControlPath quoting in Tramp
* lisp/net/tramp-sh.el (tramp-ssh-controlmaster-options): Adapt docstring. Do not quote ControlPath. Reported by Daniel Kessler <kesslerd@umich.edu>.
1 parent 7b4bdf7 commit f03c5d8

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

lisp/net/tramp-sh.el

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ configuration."
115115
"Which ssh Control* arguments to use.
116116
117117
If it is a string, it should have the form
118-
\"-o ControlMaster=auto -o ControlPath=\\='tramp.%%r@%%h:%%p\\='
118+
\"-o ControlMaster=auto -o ControlPath=tramp.%%C
119119
-o ControlPersist=no\". Percent characters in the ControlPath
120120
spec must be doubled, because the string is used as format string.
121121
@@ -4785,13 +4785,13 @@ Goes through the list `tramp-inline-compress-commands'."
47854785
(if (zerop
47864786
(tramp-call-process
47874787
vec "ssh" nil nil nil
4788-
"-G" "-o" "ControlPath='tramp.%C'" "0.0.0.1"))
4788+
"-G" "-o" "ControlPath=tramp.%C" "0.0.0.1"))
47894789
(setq tramp-ssh-controlmaster-options
47904790
(concat tramp-ssh-controlmaster-options
4791-
" -o ControlPath='tramp.%%C'"))
4791+
" -o ControlPath=tramp.%%C"))
47924792
(setq tramp-ssh-controlmaster-options
47934793
(concat tramp-ssh-controlmaster-options
4794-
" -o ControlPath='tramp.%%r@%%h:%%p'")))
4794+
" -o ControlPath=tramp.%%r@%%h:%%p")))
47954795
(when (zerop
47964796
(tramp-call-process
47974797
vec "ssh" nil nil nil

0 commit comments

Comments
 (0)