X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=ssh_config;h=4f239be572edbac120dd58546a799d8193962098;hb=8f71f32aa3e89e59258a90b93c79a7280397e8c5;hp=3cb065fcb14ae6808fdad3ed4219555d0dcf0214;hpb=fc2020eebed7ddd989ab53e6b9a709da2f39cbf9;p=config%2Fdotfiles.git

diff --git a/ssh_config b/ssh_config
index 3cb065f..4f239be 100644
--- a/ssh_config
+++ b/ssh_config
@@ -61,13 +61,22 @@ Host *
 # Allow using -M (ControlMaster) to create a master SSH session which
 # "tunnels" other connections to the same host, thus reducing the number of
 # authentications (which are relatively slow) and TCP connections. The master
-# sockets are stored in ~/.ssh (by default ControlPath is not set).
+# 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
 # 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
 # the master session which is obviously not possible.
     ControlMaster auto
+# When the connection for a master is closed (e.g. logout of remote shell),
+# move the master connection in the background. If there's no other active
+# connection using the master, close it after x seconds. This prevents the
+# client of the master connection from blocking because it waits for all
+# connections using it to terminate which is very annoying. The timeout
+# prevents stale master connections.
+    ControlPersist 10
 
 # Hash hosts in ~/.ssh/known_hosts to try to conceal the known hosts. Doesn't
 # help if the ssh hosts are stored in the shell's history file or in this file