diff options
| author | Damien Miller <djm@mindrot.org> | 2000-05-30 13:44:51 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2000-05-30 13:44:51 +1000 |
| commit | b1715dc0cf5ea91707b437310f63b17bed2dc7a6 (patch) | |
| tree | f7fe557697d12b37c6be6a97c6ce083d23fd07de /servconf.c | |
| parent | 9448c002db7427058ecca76760f3a75e379bf0a1 (diff) | |
| download | openssh-git-b1715dc0cf5ea91707b437310f63b17bed2dc7a6.tar.gz | |
- OpenBSD CVS updates:
- markus@cvs.openbsd.org
[session.c]
make x11-fwd work w/ localhost (xauth add host/unix:11)
[cipher.c compat.c readconf.c servconf.c]
check strtok() != NULL; ok niels@
[key.c]
fix key_read() for uuencoded keys w/o '='
[serverloop.c]
group ssh1 vs. ssh2 in serverloop
[kex.c kex.h myproposal.h sshconnect2.c sshd.c]
split kexinit/kexdh, factor out common code
[readconf.c ssh.1 ssh.c]
forwardagent defaults to no, add ssh -A
- theo@cvs.openbsd.org
[session.c]
just some line shortening
Diffstat (limited to 'servconf.c')
| -rw-r--r-- | servconf.c | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$Id: servconf.c,v 1.16 2000/05/09 01:03:01 damien Exp $"); +RCSID("$Id: servconf.c,v 1.17 2000/05/30 03:44:53 damien Exp $"); #include "ssh.h" #include "servconf.h" @@ -588,6 +588,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>"); @@ -598,6 +600,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'.", |