[src/netbsd-2]: src/crypto/dist/ssh Pull up following revision(s) (requested ...

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7ecbc4323e0e
branches:  netbsd-2
changeset: 564540:7ecbc4323e0e
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sun Oct 15 15:45:27 2006 +0000

description:
Pull up following revision(s) (requested by adrianp in ticket #10719):
        crypto/dist/ssh/sshd_config: revision 1.25
Change the default sshd configuration file so that only protocol version
2 is enabled by default.  Users can manually add back support for
protocol version 1 in their sshd_config if they have a specific need for it.

Suggested by perry@ and ghen@. Ok'ed security-officer@ and christos@

diffstat:

 crypto/dist/ssh/sshd_config |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 061933008212 -r 7ecbc4323e0e crypto/dist/ssh/sshd_config
--- a/crypto/dist/ssh/sshd_config       Sun Oct 15 13:10:33 2006 +0000
+++ b/crypto/dist/ssh/sshd_config       Sun Oct 15 15:45:27 2006 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: sshd_config,v 1.18.2.1 2004/05/05 15:27:40 tron Exp $
+#      $NetBSD: sshd_config,v 1.18.2.1.2.1 2006/10/15 15:45:27 bouyer Exp $
 #      $OpenBSD: sshd_config,v 1.59 2002/09/25 11:17:16 markus Exp $
 
 # This is the sshd server system-wide configuration file.  See
@@ -10,7 +10,7 @@
 # default value.
 
 #Port 22
-#Protocol 2,1
+Protocol 2
 #ListenAddress 0.0.0.0
 #ListenAddress ::