===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/clientloop.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- src/usr.bin/ssh/clientloop.c	2000/05/07 18:23:32	1.25
+++ src/usr.bin/ssh/clientloop.c	2000/05/08 17:42:24	1.26
@@ -16,7 +16,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: clientloop.c,v 1.25 2000/05/07 18:23:32 markus Exp $");
+RCSID("$Id: clientloop.c,v 1.26 2000/05/08 17:42:24 markus Exp $");
 
 #include "xmalloc.h"
 #include "ssh.h"
@@ -979,11 +979,11 @@
 		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 */