[src/netbsd-3-0]: src/crypto/dist/ssh Pull up following revision(s) (requeste...

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

details:   https://anonhg.NetBSD.org/src/rev/e14386a2f7b8
branches:  netbsd-3-0
changeset: 579309:e14386a2f7b8
user:      ghen <ghen%NetBSD.org@localhost>
date:      Mon Oct 16 22:02:41 2006 +0000

description:
Pull up following revision(s) (requested by adrianp in ticket #1555):
        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 797ac2087a70 -r e14386a2f7b8 crypto/dist/ssh/sshd_config
--- a/crypto/dist/ssh/sshd_config       Mon Oct 16 21:46:06 2006 +0000
+++ b/crypto/dist/ssh/sshd_config       Mon Oct 16 22:02:41 2006 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: sshd_config,v 1.21 2005/02/28 02:35:10 christos Exp $
+#      $NetBSD: sshd_config,v 1.21.4.1 2006/10/16 22:02:41 ghen Exp $
 #      $OpenBSD: sshd_config,v 1.69 2004/05/23 23:59:53 dtucker 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 ::