add ControlPersist option to defaults for supporting versions

diff --git a/.ssh/Makefile b/.ssh/Makefile
index 9336796e8b178f9c286f55b9c17e5ffe0401d30c..58391e72e7e0f2d489dd4093c404d916c4f4272c 100644 (file)
--- a/.ssh/Makefile
+++ b/.ssh/Makefile
@@ -22,8 +22,13 @@ SSH_VERSION = $(shell ssh -V 2>&1)
 config: config.in
        cp $< $@
        case "$(SSH_VERSION)" in \
+         (OpenSSH_5.[012345]*) \
+           sed -ri -e 's,^.+\bControlPersist\b.+$$,##UNSUPPORTED##&,' \
+                   $@ \
+           ;; \
          (OpenSSH_4.7*) \
            sed -ri -e 's,^.+\bVisualHostKey\b.+$$,##UNSUPPORTED##&,' \
+                   -e 's,^.+\bControlPersist\b.+$$,##UNSUPPORTED##&,' \
                    $@ \
            ;; \
          (OpenSSH_4.3*) \
@@ -31,13 +36,14 @@ config: config.in
                    -e 's,^.+\bMACs\b.+$$,##UNSUPPORTED##&,' \
                    -e 's,^(.+ControlPath ~/.var/ssh/ssh_control_)%l_(.+),\1\2,' \
                    -e 's,^.+\bVisualHostKey\b.+$$,##UNSUPPORTED##&,' \
+                   -e 's,^.+\bControlPersist\b.+$$,##UNSUPPORTED##&,' \
                    $@ \
            ;; \
          (3.9*) \
            sed -ri -e 's,^.+\bExitOnForwardFailure\b.+$$,##UNSUPPORTED##&,' \
                    -e 's,^.+\bMACs\b.+$$,##UNSUPPORTED##&,' \
                    -e 's,^.+\bHashKnownHosts\b.+$$,##UNSUPPORTED##&,' \
-                   -e 's,^.+\bControl(Master|Path)\b.+$$,##UNSUPPORTED##&,' \
+                   -e 's,^.+\bControl(Master|Path|Persist)\b.+$$,##UNSUPPORTED##&,' \
                    $@ \
            ;; \
        esac

diff --git a/.ssh/config.in b/.ssh/config.in
index 982bf0b8533b5ad9272078b592ccf5a82981c3a3..c3d91ffdb3c16608c3dd70cb435577e2744b1751 100644 (file)
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -434,6 +434,7 @@ Host *
   ConnectTimeout 10
   ControlPath ~/.var/ssh/ssh_control_%l_%h_%p_%r
   ControlMaster auto
+  ControlPersist 5
 ## DSAAuthentication no
 # DynamicForward off
 # EnableSSHKeysign no