diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | readconf.c | 4 |
2 files changed, 7 insertions, 3 deletions
@@ -3,6 +3,10 @@ | |||
3 | - (bal) version.c CVS ID resync | 3 | - (bal) version.c CVS ID resync |
4 | - (bal) auth-chall.c auth-passwd.c auth.h auth1.c auth2.c session.c CVS ID | 4 | - (bal) auth-chall.c auth-passwd.c auth.h auth1.c auth2.c session.c CVS ID |
5 | resync | 5 | resync |
6 | - OpenBSD CVS Sync | ||
7 | - markus@cvs.openbsd.org 2001/03/20 19:10:16 | ||
8 | [readconf.c] | ||
9 | default to SSH protocol version 2 | ||
6 | 10 | ||
7 | 20010321 | 11 | 20010321 |
8 | - (djm) Fix ttyname breakage for AIX and Tru64. Patch from Steve | 12 | - (djm) Fix ttyname breakage for AIX and Tru64. Patch from Steve |
@@ -4662,4 +4666,4 @@ | |||
4662 | - Wrote replacements for strlcpy and mkdtemp | 4666 | - Wrote replacements for strlcpy and mkdtemp |
4663 | - Released 1.0pre1 | 4667 | - Released 1.0pre1 |
4664 | 4668 | ||
4665 | $Id: ChangeLog,v 1.1001 2001/03/22 01:22:03 mouring Exp $ | 4669 | $Id: ChangeLog,v 1.1002 2001/03/22 01:24:04 mouring Exp $ |
diff --git a/readconf.c b/readconf.c index e28ac484b..bb2f2c0e0 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: readconf.c,v 1.68 2001/03/19 17:07:23 markus Exp $"); | 15 | RCSID("$OpenBSD: readconf.c,v 1.69 2001/03/20 19:10:16 markus Exp $"); |
16 | 16 | ||
17 | #include "ssh.h" | 17 | #include "ssh.h" |
18 | #include "xmalloc.h" | 18 | #include "xmalloc.h" |
@@ -805,7 +805,7 @@ fill_default_options(Options * options) | |||
805 | /* options->ciphers, default set in myproposals.h */ | 805 | /* options->ciphers, default set in myproposals.h */ |
806 | /* options->macs, default set in myproposals.h */ | 806 | /* options->macs, default set in myproposals.h */ |
807 | if (options->protocol == SSH_PROTO_UNKNOWN) | 807 | if (options->protocol == SSH_PROTO_UNKNOWN) |
808 | options->protocol = SSH_PROTO_1|SSH_PROTO_2|SSH_PROTO_1_PREFERRED; | 808 | options->protocol = SSH_PROTO_1|SSH_PROTO_2; |
809 | if (options->num_identity_files == 0) { | 809 | if (options->num_identity_files == 0) { |
810 | if (options->protocol & SSH_PROTO_1) { | 810 | if (options->protocol & SSH_PROTO_1) { |
811 | len = 2 + strlen(_PATH_SSH_CLIENT_IDENTITY) + 1; | 811 | len = 2 + strlen(_PATH_SSH_CLIENT_IDENTITY) + 1; |