X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=ssh_config;h=62babfce373192a98a322c11f2018991b53df91d;hb=b8b992b2aba6d6e9eed0f0b2e025c08511139290;hp=4b9d10ea2ec2e6d37425447575288592e02f6474;hpb=2ad973dea61b86a6c4b671617bd99fe336dba1ab;p=config%2Fdotfiles.git

diff --git a/ssh_config b/ssh_config
index 4b9d10e..62babfc 100644
--- a/ssh_config
+++ b/ssh_config
@@ -1,5 +1,27 @@
 # SSH configuration file.
 
+# Copyright (C) 2011-2012  Simon Ruderich
+#
+# This file is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this file.  If not, see <http://www.gnu.org/licenses/>.
+
+# Undocumented (and not very well tested) feature. This drops the connection
+# after 5 seconds of inactivity. Thanks to shad0VV in #openssh on Freenode
+# (2012-11-04 18:40 CET) for telling me about this undocumented feature.
+#
+#     ServerAliveCountMax 0
+#     ServerAliveInterval 5
+
 
 # Rules for all hosts.
 Host *
@@ -14,12 +36,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