Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/crypto/dist/ssh/Attic/sshd_config,v
retrieving revision 1.25.8.2
retrieving revision 1.31.6.1
diff -u -p -r1.25.8.2 -r1.31.6.1
--- src/crypto/dist/ssh/Attic/sshd_config	2008/03/23 00:13:35	1.25.8.2
+++ src/crypto/dist/ssh/Attic/sshd_config	2009/05/13 19:15:59	1.31.6.1
@@ -1,5 +1,5 @@
-#	sshd_config,v 1.25.8.1 2008/01/09 01:22:51 matt Exp
-#	$OpenBSD: sshd_config,v 1.75 2007/03/19 01:01:29 djm Exp $
+#	$NetBSD: sshd_config,v 1.31.6.1 2009/05/13 19:15:59 jym Exp $
+#	$OpenBSD: sshd_config,v 1.80 2008/07/02 02:24:18 djm Exp $
 
 # This is the sshd server system-wide configuration file.  See
 # sshd_config(5) for more information.
@@ -27,7 +27,7 @@ Protocol 2
 
 # Lifetime and size of ephemeral version 1 server key
 #KeyRegenerationInterval 1h
-#ServerKeyBits 768
+#ServerKeyBits 1024
 
 # Logging
 # obsoletes QuietMode and FascistLogging
@@ -41,6 +41,7 @@ LoginGraceTime 600
 #PermitRootLogin no
 #StrictModes yes
 #MaxAuthTries 6
+#MaxSessions 10
 
 #RSAAuthentication yes
 #PubkeyAuthentication yes
@@ -73,6 +74,7 @@ LoginGraceTime 600
 #GSSAPIAuthentication no
 #GSSAPICleanupCredentials yes
 
+#AllowAgentForwarding yes
 #AllowTcpForwarding yes
 #GatewayPorts no
 #X11Forwarding no
@@ -94,13 +96,28 @@ UsePam yes
 #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. disable in non autotuning kernels
+#TcpRcvBufPoll yes
+ 
+# allow the use of the none cipher
+#NoneEnabled no
+
+# disable hpn performance boosts. 
+#HPNDisabled no
+
+# buffer size for hpn to non-hpn connections
+#HPNBufferSize 2048
+
+
 # Example of overriding settings on a per-user basis
 #Match User anoncvs
 #	X11Forwarding no