diff options
| author | kris <kris@FreeBSD.org> | 2000-06-03 07:18:09 +0000 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2000-06-03 07:18:09 +0000 |
| commit | e503398156edd9b3ad9ebac248c30f5d5380f379 (patch) | |
| tree | ee1a7d00f7444a5417f2b5cd94a3557ba6197b77 /crypto/openssh/readconf.c | |
| parent | 10badcd8c786a973fe56a5b4fe4ea468245231e8 (diff) | |
| download | FreeBSD-src-e503398156edd9b3ad9ebac248c30f5d5380f379.zip FreeBSD-src-e503398156edd9b3ad9ebac248c30f5d5380f379.tar.gz | |
Import vendor patches: the first is written by
Brian Feldman <green@FreeBSD.org>
* Remove the gratuitous dependency on OpenSSL 0.9.5a (preparation for MFC)
* Disable agent forwarding by default in the client (security risk)
Submitted by: green
Obtained from: OpenBSD
Diffstat (limited to 'crypto/openssh/readconf.c')
| -rw-r--r-- | crypto/openssh/readconf.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/crypto/openssh/readconf.c b/crypto/openssh/readconf.c index 2053c67..15b8e6e 100644 --- a/crypto/openssh/readconf.c +++ b/crypto/openssh/readconf.c @@ -14,7 +14,7 @@ */ #include "includes.h" -RCSID("$Id: readconf.c,v 1.31 2000/05/08 17:12:15 markus Exp $"); +RCSID("$Id: readconf.c,v 1.33 2000/05/29 20:20:46 markus Exp $"); #include "ssh.h" #include "cipher.h" @@ -464,6 +464,8 @@ parse_int: case oCipher: intptr = &options->cipher; cp = strtok(NULL, WHITESPACE); + if (!cp) + fatal("%.200s line %d: Missing argument.", filename, linenum); value = cipher_number(cp); if (value == -1) fatal("%.200s line %d: Bad cipher '%s'.", @@ -474,6 +476,8 @@ parse_int: case oCiphers: cp = strtok(NULL, WHITESPACE); + if (!cp) + fatal("%.200s line %d: Missing argument.", filename, linenum); if (!ciphers_valid(cp)) fatal("%.200s line %d: Bad SSH2 cipher spec '%s'.", filename, linenum, cp ? cp : "<NONE>"); @@ -484,6 +488,8 @@ parse_int: case oProtocol: intptr = &options->protocol; cp = strtok(NULL, WHITESPACE); + if (!cp) + fatal("%.200s line %d: Missing argument.", filename, linenum); value = proto_spec(cp); if (value == SSH_PROTO_UNKNOWN) fatal("%.200s line %d: Bad protocol spec '%s'.", @@ -691,7 +697,7 @@ void fill_default_options(Options * options) { if (options->forward_agent == -1) - options->forward_agent = 1; + options->forward_agent = 0; if (options->forward_x11 == -1) options->forward_x11 = 0; if (options->gateway_ports == -1) |
