tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- OpenBSD CVS Sync 

- markus@cvs.openbsd.org 2001/03/20 19:10:16
     [readconf.c]
     default to SSH protocol version 2
This commit is contained in:
Ben Lindstrom 2001-03-22 01:24:04 +00:00
parent eebc4a2ed3
commit 6b77643fd5
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -3,6 +3,10 @@
- (bal) version.c CVS ID resync - (bal) version.c CVS ID resync
- (bal) auth-chall.c auth-passwd.c auth.h auth1.c auth2.c session.c CVS ID - (bal) auth-chall.c auth-passwd.c auth.h auth1.c auth2.c session.c CVS ID
resync resync
- OpenBSD CVS Sync
- markus@cvs.openbsd.org 2001/03/20 19:10:16
[readconf.c]
default to SSH protocol version 2
20010321 20010321
- (djm) Fix ttyname breakage for AIX and Tru64. Patch from Steve - (djm) Fix ttyname breakage for AIX and Tru64. Patch from Steve
@ -4662,4 +4666,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1001 2001/03/22 01:22:03 mouring Exp $ $Id: ChangeLog,v 1.1002 2001/03/22 01:24:04 mouring Exp $

4
readconf.c
View File

@ -12,7 +12,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: readconf.c,v 1.68 2001/03/19 17:07:23 markus Exp $"); RCSID("$OpenBSD: readconf.c,v 1.69 2001/03/20 19:10:16 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include "xmalloc.h" #include "xmalloc.h"
@ -805,7 +805,7 @@ fill_default_options(Options * options)
/* options->ciphers, default set in myproposals.h */ /* options->ciphers, default set in myproposals.h */
/* options->macs, default set in myproposals.h */ /* options->macs, default set in myproposals.h */
if (options->protocol == SSH_PROTO_UNKNOWN) if (options->protocol == SSH_PROTO_UNKNOWN)
options->protocol = SSH_PROTO_1|SSH_PROTO_2|SSH_PROTO_1_PREFERRED; options->protocol = SSH_PROTO_1|SSH_PROTO_2;
if (options->num_identity_files == 0) { if (options->num_identity_files == 0) {
if (options->protocol & SSH_PROTO_1) { if (options->protocol & SSH_PROTO_1) {
len = 2 + strlen(_PATH_SSH_CLIENT_IDENTITY) + 1; len = 2 + strlen(_PATH_SSH_CLIENT_IDENTITY) + 1;