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

[etc/ssh.git] / .ssh / Makefile

diff --git a/.ssh/Makefile b/.ssh/Makefile
index 25b571f71eee0ab57a9fa836529c7daf3b725561..1dad8a91829fbcb16581809ad715a23d70283ca2 100644 (file)
--- a/.ssh/Makefile
+++ b/.ssh/Makefile
@@ -1,4 +1,5 @@
 all: known_hosts authorized_keys config
 all: known_hosts authorized_keys config

+       @chmod -R og= .

 .PHONY: all
 
 known_hosts: $(wildcard known_hosts.d/*)
 .PHONY: all
 
 known_hosts: $(wildcard known_hosts.d/*)


@@ -27,4 +28,11 @@ config: config.in
                    -e 's,^(.+ControlPath ~/.var/ssh/ssh_control_)%l_(.+),\1\2,' \
                    $@ \
            ;; \
                    -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
        esac