ssh_config: Move ExitOnForwardFailure to forwarding settings.

[config/dotfiles.git] / ssh_config

diff --git a/ssh_config b/ssh_config
index 62babfce373192a98a322c11f2018991b53df91d..77b92a6638371d243caa1903434e52835e0a94aa 100644 (file)
--- a/ssh_config
+++ b/ssh_config
@@ -1,6 +1,9 @@
 # SSH configuration file.
+#
+# Some options are set even if they are default to prevent /etc/ssh/ssh_config
+# from overwriting them.
 
-# Copyright (C) 2011-2012  Simon Ruderich
+# Copyright (C) 2011-2013  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
@@ -36,14 +39,15 @@ Host *
 # to local X11!
     ForwardX11Trusted no
 
+# Abort if not all requested port forwardings can be set up.
+    ExitOnForwardFailure yes
+
 # 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.
+# authentications (which are relatively slow) and TCP connections. The master
+# sockets are stored in ~/.ssh (by default ControlPath is not set).
     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