updates from OpenSSH 3.8p1 release

[gssapi-openssh.git] / setup / ssh_config

diff --git a/setup/ssh_config b/setup/ssh_config
index 62093545444b2107ae06c049ebd410ced40bf529..e32c9773bec573c94c414d7efb7140c0ab8facb7 100644 (file)
--- a/setup/ssh_config
+++ b/setup/ssh_config
@@ -1,8 +1,9 @@
-#      $OpenBSD: ssh_config,v 1.10 2001/04/03 21:19:38 todd Exp $
+#      $OpenBSD: ssh_config,v 1.19 2003/08/13 08:46:31 markus Exp $
 
-# This is ssh client systemwide configuration file.  See ssh(1) for more
-# information.  This file provides defaults for users, and the values can
-# be changed in per-user configuration files or on the command line.
+# This is the ssh client system-wide configuration file.  See
+# ssh_config(5) for more information.  This file provides defaults for
+# users, and the values can be changed in per-user configuration files
+# or on the command line.
 
 # Configuration data is parsed as follows:
 #  1. command line options
@@ -17,19 +18,23 @@
 # Host *
 #   ForwardAgent no
 #   ForwardX11 no
-#   RhostsAuthentication no
-#   RhostsRSAAuthentication yes
+#   RhostsRSAAuthentication no
 #   RSAAuthentication yes
 #   PasswordAuthentication yes
-#   FallBackToRsh no
-#   UseRsh no
+#   HostbasedAuthentication no
 #   BatchMode no
 #   CheckHostIP yes
-#   StrictHostKeyChecking yes
+#   AddressFamily any
+#   ConnectTimeout 0
+#   StrictHostKeyChecking ask
 #   IdentityFile ~/.ssh/identity
-#   IdentityFile ~/.ssh/id_dsa
 #   IdentityFile ~/.ssh/id_rsa
+#   IdentityFile ~/.ssh/id_dsa
 #   Port 22
 #   Protocol 2,1
-#   Cipher blowfish
+#   Cipher 3des
+#   Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc
 #   EscapeChar ~
+
+Host *
+  ForwardX11 yes