Merge from vendor branch BIND:
[dragonfly.git] / secure / usr.bin / ssh / ssh_config.no_obj.patch
1 $DragonFly: src/secure/usr.bin/ssh/Attic/ssh_config.no_obj.patch,v 1.2 2005/06/16 08:14:02 corecode Exp $
2 Index: ssh_config
3 ===================================================================
4 RCS file: /space/cvs/dragonfly/src/crypto/openssh-3.9p1/ssh_config,v
5 retrieving revision 1.1
6 diff -u -r1.1 ssh_config
7 --- ssh_config  30 Aug 2004 21:59:58 -0000      1.1
8 +++ ssh_config  16 Jun 2005 08:08:13 -0000
9 @@ -23,7 +23,7 @@
10  #   PasswordAuthentication yes
11  #   HostbasedAuthentication no
12  #   BatchMode no
13 -#   CheckHostIP yes
14 +#   CheckHostIP no
15  #   AddressFamily any
16  #   ConnectTimeout 0
17  #   StrictHostKeyChecking ask
18 @@ -35,3 +35,7 @@
19  #   Cipher 3des
20  #   Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc
21  #   EscapeChar ~
22 +#   VersionAddendum DragonFly-20040710
23 +
24 +#   XAuthLocation /usr/X11R6/bin/xauth         # default ports/dfports
25 +#   XAuthLocation /usr/pkg/xorg/bin/xauth      # location for pkgsrc