make new patch

[gssapi-openssh.git] / setup / ssh_config

diff --git a/setup/ssh_config b/setup/ssh_config
index e0d007dad15f04d23d749285a1e28b88627cde53..873acdfc793320f2356f8e1c8bbbc4da33d51306 100644 (file)
--- a/setup/ssh_config
+++ b/setup/ssh_config
@@ -1,4 +1,4 @@
-#      $OpenBSD: ssh_config,v 1.20 2005/01/28 09:45:53 dtucker Exp $
+#      $OpenBSD: ssh_config,v 1.23 2007/06/08 04:40:40 pvalchev Exp $
 
 # This is the ssh client system-wide configuration file.  See
 # ssh_config(5) for more information.  This file provides defaults for
@@ -24,6 +24,10 @@
 #   RSAAuthentication yes
 #   PasswordAuthentication yes
 #   HostbasedAuthentication no
+#   GSSAPIAuthentication yes
+#   GSSAPIDelegateCredentials yes
+#   GSSAPIKeyExchange yes
+#   GSSAPITrustDNS yes
 #   BatchMode no
 #   CheckHostIP yes
 #   AddressFamily any
@@ -36,7 +40,8 @@
 #   Protocol 2,1
 #   Cipher 3des
 #   Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc
+#   MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160
 #   EscapeChar ~
-
-Host *
-  ForwardX11 yes
+#   Tunnel no
+#   TunnelDevice any:any
+#   PermitLocalCommand no