]> 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:

projects / etc / ssh.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: f285db6)
fix config file generation snippet
authormartin f. krafft <madduck@madduck.net>
Thu, 15 May 2008 10:57:15 +0000 (12:57 +0200)
committermartin f. krafft <madduck@madduck.net>
Thu, 15 May 2008 10:57:15 +0000 (12:57 +0200)
.ssh/Makefile patch | blob | history

diff --git a/.ssh/Makefile b/.ssh/Makefile
index 017a6bb73ecbda3a6dc82f905928d54a88629c27..25b571f71eee0ab57a9fa836529c7daf3b725561 100644 (file)
--- 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,^.+\<ExitOnForwardFailure\>.+$$,##UNSUPPORTED##&,' \
-                   -e 's,^.+\<MACs\>.+$$,##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
OpenSSH configuration

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.