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.25
retrieving revision 1.25.8.2
diff -u -p -r1.25 -r1.25.8.2
--- src/crypto/dist/ssh/Attic/sshd_config	2006/10/15 14:01:53	1.25
+++ src/crypto/dist/ssh/Attic/sshd_config	2008/03/23 00:13:35	1.25.8.2
@@ -1,5 +1,5 @@
-#	$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 $
+#	sshd_config,v 1.25.8.1 2008/01/09 01:22:51 matt Exp
+#	$OpenBSD: sshd_config,v 1.75 2007/03/19 01:01:29 djm Exp $
 
 # This is the sshd server system-wide configuration file.  See
 # sshd_config(5) for more information.
@@ -10,11 +10,15 @@
 # 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
@@ -72,6 +76,8 @@ LoginGraceTime 600
 #AllowTcpForwarding yes
 #GatewayPorts no
 #X11Forwarding no
+# If you use xorg from pkgsrc then uncomment the following line.
+#XAuthLocation /usr/pkg/bin/xauth
 #X11DisplayOffset 10
 #X11UseLocalhost yes
 #PrintMotd yes