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.14
retrieving revision 1.18.2.1.4.1
diff -u -p -r1.14 -r1.18.2.1.4.1
--- src/crypto/dist/ssh/Attic/sshd_config	2002/05/14 23:33:08	1.14
+++ src/crypto/dist/ssh/Attic/sshd_config	2006/10/15 15:44:33	1.18.2.1.4.1
@@ -1,8 +1,8 @@
-#	$NetBSD: sshd_config,v 1.14 2002/05/14 23:33:08 itojun Exp $
-#	$OpenBSD: sshd_config,v 1.52 2002/05/04 02:39:35 deraadt Exp $
+#	$NetBSD: sshd_config,v 1.18.2.1.4.1 2006/10/15 15:44:33 bouyer Exp $
+#	$OpenBSD: sshd_config,v 1.59 2002/09/25 11:17:16 markus Exp $
 
-# This is the sshd server system-wide configuration file.  See sshd(8)
-# for more information.
+# This is the sshd server system-wide configuration file.  See
+# sshd_config(5) for more information.
 
 # The strategy used for options in the default sshd_config shipped with
 # OpenSSH is to specify options with their default value where
@@ -10,7 +10,7 @@
 # default value.
 
 #Port 22
-#Protocol 2,1
+Protocol 2
 #ListenAddress 0.0.0.0
 #ListenAddress ::
 
@@ -31,7 +31,8 @@
 
 # Authentication:
 
-#LoginGraceTime 600
+# Slow machines or long keys may require more processing time.
+LoginGraceTime 600
 #PermitRootLogin no
 #StrictModes yes
 
@@ -77,6 +78,8 @@
 #KeepAlive yes
 #UseLogin no
 #UsePrivilegeSeparation yes
+#PermitUserEnvironment no
+#Compression yes
 
 #MaxStartups 10
 # no default banner path