X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=ssh_config;h=5f01046c85cc672ac38a52deeb2010435152b002;hb=4b1b6e0a391d3f7a95d515ba39d18c8e9cf80ef7;hp=b61298dabfca6f6e428dada37ab71ac34080dad5;hpb=614f9080ac810a2f4c0a5244bca856f3358e625e;p=config%2Fdotfiles.git

diff --git a/ssh_config b/ssh_config
index b61298d..5f01046 100644
--- a/ssh_config
+++ b/ssh_config
@@ -29,12 +29,18 @@ Host *
 # to local X11!
     ForwardX11Trusted no
 
-# If -M is used store the control master socket in ~/.ssh. Necessary for
-# ControlMaster to work.
+# 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.
     ControlPath ~/.ssh/master-%l-%h-%p-%r
 
+# Abort if not all requested port forwardings can be set up.
+    ExitOnForwardFailure yes
+
 # Don't send any environment variables.
     SendEnv
 
+# Check host IP in known_hosts when connecting to detect DNS spoofing.
+    CheckHostIP yes
 # Ask before adding any host keys to ~/.ssh/known_hosts.
     StrictHostKeyChecking ask