diff options
| author | kris <kris@FreeBSD.org> | 2000-06-03 07:31:44 +0000 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2000-06-03 07:31:44 +0000 |
| commit | 66c0eb5d8c98eb6176669c57e89a3c3f604a6009 (patch) | |
| tree | c37ff30e27d86e62bb0f2d8105e68d4cbc532264 /crypto/openssh/readconf.c | |
| parent | 88a84bd92e99b88721d69ddd8e17c6a1f3f78fbf (diff) | |
| download | FreeBSD-src-66c0eb5d8c98eb6176669c57e89a3c3f604a6009.zip FreeBSD-src-66c0eb5d8c98eb6176669c57e89a3c3f604a6009.tar.gz | |
Bring vendor patches onto the main branch, and resolve conflicts.
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 cf7cd14..bad4c15 100644 --- a/crypto/openssh/readconf.c +++ b/crypto/openssh/readconf.c @@ -15,7 +15,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" @@ -482,6 +482,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'.", @@ -492,6 +494,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>"); @@ -502,6 +506,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'.", @@ -713,7 +719,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) |
