Merge from vendor branch FILE:
[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.4 2006/02/13 14:47:58 corecode Exp $
2 --- ../../../crypto/openssh-4/ssh_config        2005-07-12 00:44:23.000000000 +0200
3 +++ ssh_config  2005-09-08 14:53:51.000000000 +0200
4 @@ -1,4 +1,5 @@
5  #      $OpenBSD: ssh_config,v 1.20 2005/01/28 09:45:53 dtucker Exp $
6 +#      $DragonFly: src/secure/usr.bin/ssh/Attic/ssh_config.no_obj.patch,v 1.4 2006/02/13 14:47:58 corecode Exp $
7  
8  # This is the ssh client system-wide configuration file.  See
9  # ssh_config(5) for more information.  This file provides defaults for
10 @@ -25,7 +26,7 @@
11  #   PasswordAuthentication yes
12  #   HostbasedAuthentication no
13  #   BatchMode no
14 -#   CheckHostIP yes
15 +#   CheckHostIP no
16  #   AddressFamily any
17  #   ConnectTimeout 0
18  #   StrictHostKeyChecking ask
19 @@ -37,3 +38,6 @@
20  #   Cipher 3des
21  #   Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc
22  #   EscapeChar ~
23 +#   VersionAddendum DragonFly-20060212
24 +
25 +#   XAuthLocation /usr/pkg/xorg/bin/xauth