===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sshd_config,v
retrieving revision 1.59.2.1
retrieving revision 1.60
diff -u -r1.59.2.1 -r1.60
--- src/usr.bin/ssh/sshd_config	2003/09/16 21:20:29	1.59.2.1
+++ src/usr.bin/ssh/sshd_config	2003/06/02 09:17:34	1.60
@@ -1,4 +1,4 @@
-#	$OpenBSD: sshd_config,v 1.59.2.1 2003/09/16 21:20:29 brad Exp $
+#	$OpenBSD: sshd_config,v 1.60 2003/06/02 09:17:34 markus Exp $
 
 # This is the sshd server system-wide configuration file.  See
 # sshd_config(5) for more information.
@@ -20,7 +20,7 @@
 #HostKey /etc/ssh/ssh_host_dsa_key
 
 # Lifetime and size of ephemeral version 1 server key
-#KeyRegenerationInterval 1h
+#KeyRegenerationInterval 3600
 #ServerKeyBits 768
 
 # Logging
@@ -30,7 +30,7 @@
 
 # Authentication:
 
-#LoginGraceTime 2m
+#LoginGraceTime 120
 #PermitRootLogin yes
 #StrictModes yes
 
@@ -38,6 +38,10 @@
 #PubkeyAuthentication yes
 #AuthorizedKeysFile	.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/ssh_known_hosts
 #RhostsRSAAuthentication no
 # similar for protocol version 2
@@ -45,8 +49,6 @@
 # Change to yes if you don't trust ~/.ssh/known_hosts for
 # RhostsRSAAuthentication and HostbasedAuthentication
 #IgnoreUserKnownHosts no
-# Don't read the user's ~/.rhosts and ~/.shosts files
-#IgnoreRhosts yes
 
 # To disable tunneled clear text passwords, change to no here!
 #PasswordAuthentication yes
@@ -60,12 +62,11 @@
 #KerberosOrLocalPasswd yes
 #KerberosTicketCleanup yes
 
-# GSSAPI options
-#GSSAPIAuthentication no
-#GSSAPICleanupCreds yes
+#AFSTokenPassing no
 
-#AllowTcpForwarding yes
-#GatewayPorts no
+# Kerberos TGT Passing only works with the AFS kaserver
+#KerberosTgtPassing no
+
 #X11Forwarding no
 #X11DisplayOffset 10
 #X11UseLocalhost yes
@@ -76,14 +77,11 @@
 #UsePrivilegeSeparation yes
 #PermitUserEnvironment no
 #Compression yes
-#ClientAliveInterval 0
-#ClientAliveCountMax 3
-#UseDNS yes
-#PidFile /var/run/sshd.pid
-#MaxStartups 10
 
+#MaxStartups 10
 # no default banner path
 #Banner /some/path
+#UseDNS yes
 
 # override default of no subsystems
 Subsystem	sftp	/usr/libexec/sftp-server