diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 2000-06-03 09:58:15 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 2000-06-03 09:58:15 +0000 |
| commit | c322fe352dd76b81299a0331e94d99f2b5ca30ed (patch) | |
| tree | b148a1206a38427ca149588fdee7d7f057f9fd27 /crypto/openssh/servconf.c | |
| parent | 75136688087f381b6178024d74a01798dbba3836 (diff) | |
| download | src-c322fe352dd76b81299a0331e94d99f2b5ca30ed.tar.gz src-c322fe352dd76b81299a0331e94d99f2b5ca30ed.zip | |
Resolve conflicts
Notes
Notes:
svn path=/head/; revision=61212
Diffstat (limited to 'crypto/openssh/servconf.c')
| -rw-r--r-- | crypto/openssh/servconf.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/crypto/openssh/servconf.c b/crypto/openssh/servconf.c index 9f35d4a324d3..7bb92211ab6c 100644 --- a/crypto/openssh/servconf.c +++ b/crypto/openssh/servconf.c @@ -13,7 +13,7 @@ */ #include "includes.h" -RCSID("$Id: servconf.c,v 1.40 2000/05/08 17:12:15 markus Exp $"); +RCSID("$Id: servconf.c,v 1.41 2000/05/22 18:42:01 markus Exp $"); #include "ssh.h" #include "servconf.h" @@ -622,6 +622,8 @@ parse_flag: case sCiphers: cp = strtok(NULL, WHITESPACE); + if (!cp) + fatal("%s line %d: Missing argument.", filename, linenum); if (!ciphers_valid(cp)) fatal("%s line %d: Bad SSH2 cipher spec '%s'.", filename, linenum, cp ? cp : "<NONE>"); @@ -632,6 +634,8 @@ parse_flag: case sProtocol: intptr = &options->protocol; cp = strtok(NULL, WHITESPACE); + if (!cp) + fatal("%s line %d: Missing argument.", filename, linenum); value = proto_spec(cp); if (value == SSH_PROTO_UNKNOWN) fatal("%s line %d: Bad protocol spec '%s'.", |