===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sshd_config,v
retrieving revision 1.21
retrieving revision 1.21.2.5
diff -u -r1.21 -r1.21.2.5
--- src/usr.bin/ssh/sshd_config	2000/10/11 20:14:39	1.21
+++ src/usr.bin/ssh/sshd_config	2001/09/27 00:15:43	1.21.2.5
@@ -1,43 +1,55 @@
-# This is ssh server systemwide configuration file.
+#	$OpenBSD: sshd_config,v 1.21.2.5 2001/09/27 00:15:43 miod Exp $
 
+# This is the sshd server system-wide configuration file.  See sshd(8)
+# for more information.
+
 Port 22
 #Protocol 2,1
 #ListenAddress 0.0.0.0
 #ListenAddress ::
+
+# HostKey for protocol version 1
 HostKey /etc/ssh_host_key
-ServerKeyBits 768
-LoginGraceTime 600
+# HostKeys for protocol version 2
+HostKey /etc/ssh_host_rsa_key
+HostKey /etc/ssh_host_dsa_key
+
+# Lifetime and size of ephemeral version 1 server key
 KeyRegenerationInterval 3600
-PermitRootLogin yes
-#
-# Don't read ~/.rhosts and ~/.shosts files
-IgnoreRhosts yes
-# Uncomment if you don't trust ~/.ssh/known_hosts for RhostsRSAAuthentication
-#IgnoreUserKnownHosts yes
-StrictModes yes
-X11Forwarding no
-X11DisplayOffset 10
-PrintMotd yes
-KeepAlive yes
+ServerKeyBits 768
 
 # Logging
 SyslogFacility AUTH
 LogLevel INFO
 #obsoletes QuietMode and FascistLogging
 
+# Authentication:
+
+LoginGraceTime 600
+PermitRootLogin yes
+StrictModes yes
+
+RSAAuthentication yes
+PubkeyAuthentication yes
+#AuthorizedKeysFile	%h/.ssh/authorized_keys
+
+# rhosts authentication should not be used
 RhostsAuthentication no
-#
+# Don't read the user's ~/.rhosts and ~/.shosts files
+IgnoreRhosts yes
 # For this to work you will also need host keys in /etc/ssh_known_hosts
 RhostsRSAAuthentication no
-#
-RSAAuthentication yes
+# similar for protocol version 2
+HostbasedAuthentication no
+# Uncomment if you don't trust ~/.ssh/known_hosts for RhostsRSAAuthentication
+#IgnoreUserKnownHosts yes
 
 # To disable tunneled clear text passwords, change to no here!
 PasswordAuthentication yes
 PermitEmptyPasswords no
+
 # Uncomment to disable s/key passwords 
-#SkeyAuthentication no
-#KbdInteractiveAuthentication yes
+#ChallengeResponseAuthentication no
 
 # To change Kerberos options
 #KerberosAuthentication no
@@ -48,9 +60,15 @@
 # Kerberos TGT Passing does only work with the AFS kaserver
 #KerberosTgtPassing yes
 
-#CheckMail yes
+X11Forwarding no
+X11DisplayOffset 10
+PrintMotd yes
+#PrintLastLog no
+KeepAlive yes
 #UseLogin no
 
-# Uncomment if you want to enable sftp
-#Subsystem	sftp	/usr/libexec/sftp-server
 #MaxStartups 10:30:60
+#Banner /etc/issue.net
+#ReverseMappingCheck yes
+
+Subsystem	sftp	/usr/libexec/sftp-server