]> git.madduck.net Git - etc/ssh.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Merge branch 'master' of ssh://git.madduck.net/~/git/pub/etc/ssh
authormartin f. krafft <madduck@madduck.net>
Thu, 15 May 2008 11:56:54 +0000 (13:56 +0200)
committermartin f. krafft <madduck@madduck.net>
Thu, 15 May 2008 11:56:54 +0000 (13:56 +0200)
1  2 
.ssh/Makefile

diff --combined .ssh/Makefile
index fcd46f6b539bab7836fb4961df6db813f5e3f188,1dad8a91829fbcb16581809ad715a23d70283ca2..6de2f3044572f074797bf17b5329dd9e741b5b50
@@@ -8,7 -8,7 +8,7 @@@ known_hosts: $(wildcard known_hosts.d/*
          echo; \
          echo "### from $$f:"; \
          cat $$f; \
 -      done >> $@
 +      done > $@
  
  authorized_keys: $(wildcard authorized_keys.d/*)
        touch $@
@@@ -16,7 -16,7 +16,7 @@@
          echo; \
          echo "### from $$f:"; \
          cat $$f; \
 -      done >> $@
 +      done > $@
  
  SSH_VERSION = $(shell ssh -V 2>&1)
  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