From: martin f. krafft <madduck@madduck.net>
Date: Sun, 1 Mar 2009 17:37:53 +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/b439e12e4052a3abf4f07e3dbee94982bece06ba?ds=inline;hp=-c

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

b439e12e4052a3abf4f07e3dbee94982bece06ba
diff --combined .ssh/config.in
index 6cfa59a,40aa48f..d25f952
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@@ -27,6 -27,12 +27,12 @@@ Host openvpn.madduck.net | openvp
    User madduck
    HostKeyAlias pulse.madduck.net
    #AddressFamily inet
+ Host ssh443.madduck.net | ssh443
+   User madduck
+   HostKeyAlias pulse.madduck.net
+   ForwardAgent yes
+   Port 443
+   #AddressFamily inet
  
  Host khyber.madduck.net | khyber
    ForwardAgent yes
@@@ -101,6 -107,7 +107,6 @@@ Host pict.oerlikon.madduck.net | pic
  #  AddressFamily inet
  
  Host lust.oerlikon.madduck.net | lust | hermia
 -  AddressFamily inet
    HostKeyAlias hermia.mjollnir.org
    ForwardX11 yes
    CheckHostIP no