From: martin f. krafft Date: Thu, 15 May 2008 10:57:15 +0000 (+0200) Subject: fix config file generation snippet X-Git-Url: https://git.madduck.net/etc/ssh.git/commitdiff_plain/1b94e7ee3040fa3957a3555a2aa30a8af0392c00?ds=inline;hp=-c fix config file generation snippet --- 1b94e7ee3040fa3957a3555a2aa30a8af0392c00 diff --git a/.ssh/Makefile b/.ssh/Makefile index 017a6bb..25b571f 100644 --- a/.ssh/Makefile +++ b/.ssh/Makefile @@ -17,11 +17,14 @@ authorized_keys: $(wildcard authorized_keys.d/*) cat $$f; \ done >> $@ +SSH_VERSION = $(shell ssh -V 2>&1) config: config.in cp $< $@ - case "$(ssh -V)" in \ - OpenSSH_4.3*) \ - sed -ri -e 's,^.+\.+$$,##UNSUPPORTED##&,' \ - -e 's,^.+\.+$$,##UNSUPPORTED##&,' $@ \ + case "$(SSH_VERSION)" in \ + (OpenSSH_4.3*) \ + sed -ri -e 's,^.+\bExitOnForwardFailure\b.+$$,##UNSUPPORTED##&,' \ + -e 's,^.+\bMACs\b.+$$,##UNSUPPORTED##&,' \ + -e 's,^(.+ControlPath ~/.var/ssh/ssh_control_)%l_(.+),\1\2,' \ + $@ \ ;; \ esac