diff options
| author | djm <djm> | 2001-03-19 22:15:57 +0000 |
|---|---|---|
| committer | djm <djm> | 2001-03-19 22:15:57 +0000 |
| commit | 67160dbd2759a10ccbac58822bd239cde4baa77c (patch) | |
| tree | 0162eecb4ba1e60b28a088bc4dc2ab72ea0f0a7d /readconf.c | |
| parent | f27ee2c46696d3176bb8dd5fe832eb06833c8279 (diff) | |
| download | openssh-67160dbd2759a10ccbac58822bd239cde4baa77c.tar.gz | |
- markus@cvs.openbsd.org 2001/03/19 17:07:23
[auth.c readconf.c]
undo /etc/shell and proto 2,1 change for openssh-2.5.2
Diffstat (limited to 'readconf.c')
| -rw-r--r-- | readconf.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: readconf.c,v 1.67 2001/03/10 17:51:04 markus Exp $"); +RCSID("$OpenBSD: readconf.c,v 1.68 2001/03/19 17:07:23 markus Exp $"); #include "ssh.h" #include "xmalloc.h" @@ -805,7 +805,7 @@ fill_default_options(Options * options) /* options->ciphers, default set in myproposals.h */ /* options->macs, default set in myproposals.h */ if (options->protocol == SSH_PROTO_UNKNOWN) - options->protocol = SSH_PROTO_1|SSH_PROTO_2; + options->protocol = SSH_PROTO_1|SSH_PROTO_2|SSH_PROTO_1_PREFERRED; if (options->num_identity_files == 0) { if (options->protocol & SSH_PROTO_1) { len = 2 + strlen(_PATH_SSH_CLIENT_IDENTITY) + 1; |