diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2000-05-07 18:23:33 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2000-05-07 18:23:33 +0000 |
| commit | 5b9199757501f9eb3a74ee777f6260712b08e200 (patch) | |
| tree | ac9d1ae593edb867209863726e0e8b00bcc87438 | |
| parent | ce3e4d0c69cb4983645a3ffda849830b1c112f33 (diff) | |
make x11-fwd interop w/ ssh-2.0.13
| -rw-r--r-- | usr.bin/ssh/clientloop.c | 9 | ||||
| -rw-r--r-- | usr.bin/ssh/sshconnect2.c | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/usr.bin/ssh/clientloop.c b/usr.bin/ssh/clientloop.c index 5ab1d61c420..84b7aae23c8 100644 --- a/usr.bin/ssh/clientloop.c +++ b/usr.bin/ssh/clientloop.c @@ -16,7 +16,7 @@ */ #include "includes.h" -RCSID("$Id: clientloop.c,v 1.24 2000/05/02 22:25:03 markus Exp $"); +RCSID("$Id: clientloop.c,v 1.25 2000/05/07 18:23:32 markus Exp $"); #include "xmalloc.h" #include "ssh.h" @@ -979,7 +979,12 @@ client_input_channel_open(int type, int plen) char *originator; int originator_port; originator = packet_get_string(NULL); - originator_port = packet_get_int(); + if (packet_remaining() > 0) { + originator_port = packet_get_int(); + } else { + debug("buggy server: x11 request w/o originator_port"); + originator_port = 0; + } packet_done(); /* XXX check permission */ xfree(originator); diff --git a/usr.bin/ssh/sshconnect2.c b/usr.bin/ssh/sshconnect2.c index 17325b097ff..3bddd7cc8c3 100644 --- a/usr.bin/ssh/sshconnect2.c +++ b/usr.bin/ssh/sshconnect2.c @@ -28,7 +28,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshconnect2.c,v 1.7 2000/05/06 17:45:37 markus Exp $"); +RCSID("$OpenBSD: sshconnect2.c,v 1.8 2000/05/07 18:23:32 markus Exp $"); #include <openssl/bn.h> #include <openssl/rsa.h> @@ -405,7 +405,7 @@ ssh_userauth2(const char *server_user, char *host) xfree(reply); } else { /* payload empty for ssh-2.0.13 ?? */ - log("buggy server: service_accept w/o service"); + debug("buggy server: service_accept w/o service"); } packet_done(); debug("got SSH2_MSG_SERVICE_ACCEPT"); |