From: martin f. krafft <madduck@madduck.net>
Date: Thu, 15 May 2008 11:51:11 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.madduck.net/~/git/pub/etc/ssh
X-Git-Url: https://git.madduck.net/etc/ssh.git/commitdiff_plain/d6f6bb76ce73a2ccc180176deb7ceeffd9476c5f?hp=eb4b4adb0b585412ebfca06b357b9b88c35f9631

Merge branch 'master' of ssh://git.madduck.net/~/git/pub/etc/ssh
---

diff --git a/.ssh/Makefile b/.ssh/Makefile
index 2e751c2..1dad8a9 100644
--- a/.ssh/Makefile
+++ b/.ssh/Makefile
@@ -28,4 +28,11 @@ config: config.in
 	            -e 's,^(.+ControlPath ~/.var/ssh/ssh_control_)%l_(.+),\1\2,' \
 	            $@ \
 	    ;; \
+	  (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##&,' \
+	            $@ \
+	    ;; \
 	esac