1 files changed, 7 insertions, 0 deletions
diff --git a/ssh/config b/ssh/config
index af407b1..d23219c 100644
--- a/ssh/config
+++ b/ssh/config
@@ -2,3 +2,10 @@
 
 Include config-wmf
 Include config-pers
+
+# Default settings for everything. These can be overridden by EARLIER
+# matches on Host or Match.
+
+Host *
+    ForwardAgent no
+    ControlMaster no