ssh_config: store ControlMaster socket in ~/.ssh/master/

diff --git a/setup.sh b/setup.sh
index c1922a2883aa49244413181b1a13b74374ebd8de..2280eabd43ed5337a742b20739fa7411182e2cdd 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -286,6 +286,7 @@ if installed htop; then
     link htoprc ~/.config/htop/htoprc
 fi
 if test -d ~/.ssh && test -O ~/.ssh; then
+    mkdir -p ~/.ssh/master
     link ssh_config ~/.ssh/config
 fi
 if installed dig; then

diff --git a/ssh_config b/ssh_config
index 188d9251e1353457443db676fc5200052d83ee5c..babd153a0cacd5593a0cba5754dc441fa213a96f 100644 (file)
--- a/ssh_config
+++ b/ssh_config
@@ -102,7 +102,7 @@ Host *
 # sockets are stored in ~/.ssh (by default ControlPath is not set). Using %r
 # (remote user name) might leak information to other users on the current
 # system (e.g. via netstat or lsof).
-    ControlPath ~/.ssh/master-%l-%h-%p-%r
+    ControlPath ~/.ssh/master/%l-%h-%p-%r
 # Automatically create a new master session if there's none yet or use an
 # existing one. This way the user doesn't have to use -M to enable a master
 # manually. Don't set this option to "yes" or all SSH commands try to become