diff options
author | kris <kris@FreeBSD.org> | 2000-06-03 09:58:15 +0000 |
---|---|---|
committer | kris <kris@FreeBSD.org> | 2000-06-03 09:58:15 +0000 |
commit | a55fcaa060a8a5296437da631991116b28e265bd (patch) | |
tree | 2957447454494c2046af5187ecd51e430756eba6 /crypto/openssh/servconf.c | |
parent | 0a76acd42d2d8bc381424757c0a50f026a2c4324 (diff) | |
download | FreeBSD-src-a55fcaa060a8a5296437da631991116b28e265bd.zip FreeBSD-src-a55fcaa060a8a5296437da631991116b28e265bd.tar.gz |
Resolve conflicts
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 9f35d4a..7bb9221 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'.", |