merged OpenSSH 3.9p1 to trunk

[gssapi-openssh.git] / openssh / sshd_config

diff --git a/openssh/sshd_config b/openssh/sshd_config
index 3f98f92679113418c1d51037a93ff1d4f84a66ed..6b584e570eb971051d4dd81d0796e154c4453846 100644 (file)
--- a/openssh/sshd_config
+++ b/openssh/sshd_config
@@ -1,4 +1,4 @@
-#      $OpenBSD: sshd_config,v 1.74 2006/07/19 13:07:10 dtucker Exp $
+#      $OpenBSD: sshd_config,v 1.77 2008/02/08 23:24:07 djm Exp $
 
 # This is the sshd server system-wide configuration file.  See
 # sshd_config(5) for more information.
@@ -11,11 +11,15 @@
 # default value.
 
 #Port 22
-#Protocol 2,1
 #AddressFamily any
 #ListenAddress 0.0.0.0
 #ListenAddress ::
 
+# Disable legacy (protocol version 1) support in the server for new
+# installations. In future the default will change to require explicit
+# activation of protocol 1
+Protocol 2
+
 # HostKey for protocol version 1
 #HostKey /etc/ssh/ssh_host_key
 # HostKeys for protocol version 2
@@ -105,16 +109,18 @@
 #PidFile /var/run/sshd.pid
 #MaxStartups 10
 #PermitTunnel no
+#ChrootDirectory none
 
 # no default banner path
-#Banner /some/path
+#Banner none
 
 # override default of no subsystems
 Subsystem      sftp    /usr/libexec/sftp-server
 
+
 # the following are HPN related configuration options
-# tcp receive buffer polling. enable in autotuning kernels
-#TcpRcvBufPoll no
+# tcp receive buffer polling. disable in non autotuning kernels
+#TcpRcvBufPoll yes
  
 # allow the use of the none cipher
 #NoneEnabled no
@@ -122,7 +128,7 @@ Subsystem   sftp    /usr/libexec/sftp-server
 # disable hpn performance boosts. 
 #HPNDisabled no
 
-# buffer size for hpn to non-hn connections
+# buffer size for hpn to non-hpn connections
 #HPNBufferSize 2048