- OpenBSD CVS update

[openssh.git] / clientloop.c

diff --git a/clientloop.c b/clientloop.c
index f91cb80b2085baaf4b2e6ef6cfa3f2d63cb8e9c5..47ef2fc97e224f7cd417d56ec287e74fb5fad888 100644 (file)
--- a/clientloop.c
+++ b/clientloop.c
@@ -979,11 +979,11 @@ client_input_channel_open(int type, int plen)
                char *originator;
                int originator_port;
                originator = packet_get_string(NULL);
-               if (packet_remaining() > 0) {
-                       originator_port = packet_get_int();
-               } else {
+               if (datafellows & SSH_BUG_X11FWD) {
                        debug("buggy server: x11 request w/o originator_port");
                        originator_port = 0;
+               } else {
+                       originator_port = packet_get_int();
                }
                packet_done();
                /* XXX check permission */