summaryrefslogtreecommitdiff
path: root/clientloop.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-05-08 13:44:52 +1000
committerDamien Miller <djm@mindrot.org>2000-05-08 13:44:52 +1000
commit6d48871fafed89fe878f44744a1abc0f5a47afb4 (patch)
tree811dee8ddd57787d408b50490c7dad14b58f0802 /clientloop.c
parent58e579bcd987397aeeb5f0a7935ffdfa67125f37 (diff)
- OpenBSD CVS updateV_2_0_0_BETA2
- markus@cvs.openbsd.org [clientloop.c sshconnect2.c] - make x11-fwd interop w/ ssh-2.0.13 [README.openssh2] - interop w/ SecureFX - Release 2.0.0beta2
Diffstat (limited to 'clientloop.c')
-rw-r--r--clientloop.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/clientloop.c b/clientloop.c
index 382cfe1f..e34f5cda 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -16,7 +16,7 @@
*/
#include "includes.h"
-RCSID("$Id: clientloop.c,v 1.14 2000/05/07 02:03:16 damien Exp $");
+RCSID("$Id: clientloop.c,v 1.15 2000/05/08 03:44:53 damien 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);