merged OpenSSH 3.9p1 to trunk

[gssapi-openssh.git] / openssh / sshd_config

diff --git a/openssh/sshd_config b/openssh/sshd_config
index d9ede78a066cfd3e9ca4485e6e958e48148448d2..6b584e570eb971051d4dd81d0796e154c4453846 100644 (file)
--- a/openssh/sshd_config
+++ b/openssh/sshd_config
@@ -1,4 +1,4 @@
-#      $OpenBSD: sshd_config,v 1.75 2007/03/19 01:01:29 djm 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.
@@ -109,17 +109,18 @@ Protocol 2
 #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
@@ -127,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