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.14
retrieving revision 1.24
diff -u -p -r1.1.1.14 -r1.24
--- src/crypto/dist/ssh/Attic/sshd_config	2006/02/04 22:23:24	1.1.1.14
+++ src/crypto/dist/ssh/Attic/sshd_config	2006/09/28 21:22:15	1.24
@@ -1,5 +1,5 @@
-#	$NetBSD: sshd_config,v 1.1.1.14 2006/02/04 22:23:24 christos Exp $
-#	$OpenBSD: sshd_config,v 1.73 2005/12/06 22:38:28 reyk 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.
@@ -32,8 +32,9 @@
 
 # Authentication:
 
-#LoginGraceTime 2m
-#PermitRootLogin yes
+# Slow machines or long keys may require more processing time.
+LoginGraceTime 600
+#PermitRootLogin no
 #StrictModes yes
 #MaxAuthTries 6
 
@@ -78,6 +79,7 @@
 #TCPKeepAlive yes
 #UseLogin no
 #UsePrivilegeSeparation yes
+UsePam yes
 #PermitUserEnvironment no
 #Compression delayed
 #ClientAliveInterval 0
@@ -92,3 +94,9 @@
 
 # override default of no subsystems
 Subsystem	sftp	/usr/libexec/sftp-server
+
+# Example of overriding settings on a per-user basis
+#Match User anoncvs
+#	X11Forwarding no
+#	AllowTcpForwarding no
+#	ForceCommand cvs server