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.1.1.16
retrieving revision 1.25
diff -u -p -r1.1.1.16 -r1.25
--- src/crypto/dist/ssh/Attic/sshd_config	2007/12/17 20:15:36	1.1.1.16
+++ src/crypto/dist/ssh/Attic/sshd_config	2006/10/15 14:01:53	1.25
@@ -1,5 +1,5 @@
-#	$NetBSD: sshd_config,v 1.1.1.16 2007/12/17 20:15:36 christos Exp $
-#	$OpenBSD: sshd_config,v 1.75 2007/03/19 01:01:29 djm Exp $
+#	$NetBSD: sshd_config,v 1.25 2006/10/15 14:01:53 adrianp Exp $
+#	$OpenBSD: sshd_config,v 1.74 2006/07/19 13:07:10 dtucker Exp $
 
 # This is the sshd server system-wide configuration file.  See
 # sshd_config(5) for more information.
@@ -10,15 +10,11 @@
 # default value.
 
 #Port 22
+Protocol 2
 #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
@@ -36,8 +32,9 @@ Protocol 2
 
 # Authentication:
 
-#LoginGraceTime 2m
-#PermitRootLogin yes
+# Slow machines or long keys may require more processing time.
+LoginGraceTime 600
+#PermitRootLogin no
 #StrictModes yes
 #MaxAuthTries 6
 
@@ -82,6 +79,7 @@ Protocol 2
 #TCPKeepAlive yes
 #UseLogin no
 #UsePrivilegeSeparation yes
+UsePam yes
 #PermitUserEnvironment no
 #Compression delayed
 #ClientAliveInterval 0