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.18
retrieving revision 1.24
diff -u -p -r1.1.1.18 -r1.24
--- src/crypto/dist/ssh/Attic/sshd_config	2009/02/16 17:14:50	1.1.1.18
+++ src/crypto/dist/ssh/Attic/sshd_config	2006/09/28 21:22:15	1.24
@@ -1,4 +1,5 @@
-#	$OpenBSD: sshd_config,v 1.80 2008/07/02 02:24:18 djm Exp $
+#	$NetBSD: sshd_config,v 1.24 2006/09/28 21:22:15 christos 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.
@@ -9,15 +10,11 @@
 # 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
@@ -26,7 +23,7 @@ Protocol 2
 
 # Lifetime and size of ephemeral version 1 server key
 #KeyRegenerationInterval 1h
-#ServerKeyBits 1024
+#ServerKeyBits 768
 
 # Logging
 # obsoletes QuietMode and FascistLogging
@@ -35,11 +32,11 @@ 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
-#MaxSessions 10
 
 #RSAAuthentication yes
 #PubkeyAuthentication yes
@@ -72,7 +69,6 @@ Protocol 2
 #GSSAPIAuthentication no
 #GSSAPICleanupCredentials yes
 
-#AllowAgentForwarding yes
 #AllowTcpForwarding yes
 #GatewayPorts no
 #X11Forwarding no
@@ -83,6 +79,7 @@ Protocol 2
 #TCPKeepAlive yes
 #UseLogin no
 #UsePrivilegeSeparation yes
+UsePam yes
 #PermitUserEnvironment no
 #Compression delayed
 #ClientAliveInterval 0
@@ -91,10 +88,9 @@ Protocol 2
 #PidFile /var/run/sshd.pid
 #MaxStartups 10
 #PermitTunnel no
-#ChrootDirectory none
 
 # no default banner path
-#Banner none
+#Banner /some/path
 
 # override default of no subsystems
 Subsystem	sftp	/usr/libexec/sftp-server