summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2001-03-30 10:39:13 +1000
committerDamien Miller <djm@mindrot.org>2001-03-30 10:39:13 +1000
commit42d3204db9c94a63092b3ac31feafe7475b2a6db (patch)
treefc0578403f7d884a6c693473a56defb34f2a4831
parent61e8c0ac1a12f49562ba002ee55075a04d3c5dde (diff)
- (djm) Document default protocol order in config files
-rw-r--r--ChangeLog3
-rw-r--r--ssh_config2
-rw-r--r--sshd_config2
3 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 337c529b..88644c18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
20010330
- (djm) Another openbsd-compat/glob.c sync
+ - (djm) Document default protocol order in config files
20010328
- (djm) Reorder tests and library inclusion for Krb4/AFS to try to
@@ -4691,4 +4692,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.991.2.16 2001/03/30 00:23:08 djm Exp $
+$Id: ChangeLog,v 1.991.2.17 2001/03/30 00:39:13 djm Exp $
diff --git a/ssh_config b/ssh_config
index e3faa770..9ae33cab 100644
--- a/ssh_config
+++ b/ssh_config
@@ -31,6 +31,6 @@
# IdentityFile ~/.ssh/id_rsa1
# IdentityFile ~/.ssh/id_rsa2
# Port 22
-# Protocol 2,1
+# Protocol 1,2
# Cipher blowfish
# EscapeChar ~
diff --git a/sshd_config b/sshd_config
index c122558b..9493a853 100644
--- a/sshd_config
+++ b/sshd_config
@@ -6,7 +6,7 @@
# for more information.
Port 22
-#Protocol 2,1
+#Protocol 1,2
#ListenAddress 0.0.0.0
#ListenAddress ::
HostKey /etc/ssh_host_key