From: martin f. krafft Date: Tue, 31 Aug 2010 07:22:28 +0000 (+0200) Subject: add ControlPersist option to defaults for supporting versions X-Git-Url: https://git.madduck.net/etc/ssh.git/commitdiff_plain/3a9cfa3f693f89f678313b9208df32b4c8c9658e?ds=sidebyside add ControlPersist option to defaults for supporting versions --- diff --git a/.ssh/Makefile b/.ssh/Makefile index 9336796..58391e7 100644 --- 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 982bf0b..c3d91ff 100644 --- 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