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 /compat.c | |
parent | 9448c002db7427058ecca76760f3a75e379bf0a1 (diff) |
- 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 'compat.c')
-rw-r--r-- | compat.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -28,7 +28,7 @@ */ #include "includes.h" -RCSID("$Id: compat.c,v 1.10 2000/05/09 01:03:00 damien Exp $"); +RCSID("$Id: compat.c,v 1.11 2000/05/30 03:44:53 damien Exp $"); #include "ssh.h" #include "packet.h" @@ -80,10 +80,12 @@ compat_datafellows(const char *version) int proto_spec(const char *spec) { - char *s = xstrdup(spec); - char *p; + char *s, *p; int ret = SSH_PROTO_UNKNOWN; + if (spec == NULL) + return ret; + s = xstrdup(spec); for ((p = strtok(s, SEP)); p; (p = strtok(NULL, SEP))) { switch(atoi(p)) { case 1: |