Hi,
On Wed, 2005-05-11 at 17:08, Leonard den Ottolander wrote:
The SSH X11Forward crash is still existent in current CVS (2005-05-11).
Maybe you haven't tried a correct test case. OpenSSH = 3.8.1.
/etc/ssh/ssh_config should contain
ForwardX11 yes
ForwardX11Trusted no
and /etc/ssh/sshd_config should contain
X11Forwarding yes
$ ssh localhost
$ mc
press a non alphanumeric key (f.e. arrow down)
Boom. BadWindow (invalid Window parameter).
I mistakenly assumed this patch was committed to MC_4_6_1_PRE.
Backported Roland's fix to the PRE tree. This seems to work. The above
issue is no longer reproducible with this patch applied. Can I commit
it? Can we have a release now?
Leonard.
--
mount -t life -o ro /dev/dna /genetic/research
--- src/Makefile.am.000 2004-11-24 00:04:18.0 +0100
+++ src/Makefile.am 2005-03-10 10:44:36.0 +0100
@@ -59,7 +59,8 @@ SRCS = achown.c achown.h background.c ba
slint.c subshell.c subshell.h textconf.c textconf.h \
tree.c tree.h treestore.c treestore.h tty.h user.c user.h \
util.c util.h utilunix.c view.c view.h vfsdummy.h widget.c \
- widget.h win.c win.h wtools.c wtools.h
+ widget.h win.c win.h wtools.c wtools.h unixcompat.h \
+ x11conn.h x11conn.c
if CHARSET
mc_SOURCES = $(SRCS) $(CHARSET_SRC)
--- src/Makefile.in.000 2005-05-11 16:24:55.0 +0200
+++ src/Makefile.in 2005-05-15 13:22:04.0 +0200
@@ -237,7 +237,8 @@ SRCS = achown.c achown.h background.c ba
slint.c subshell.c subshell.h textconf.c textconf.h \
tree.c tree.h treestore.c treestore.h tty.h user.c user.h \
util.c util.h utilunix.c view.c view.h vfsdummy.h widget.c \
- widget.h win.c win.h wtools.c wtools.h
+ widget.h win.c win.h wtools.c wtools.h unixcompat.h \
+ x11conn.h x11conn.c
@[EMAIL PROTECTED] = $(SRCS)
@@ -281,7 +282,8 @@ am__mc_SOURCES_DIST = achown.c achown.h
textconf.c textconf.h tree.c tree.h treestore.c treestore.h \
tty.h user.c user.h util.c util.h utilunix.c view.c view.h \
vfsdummy.h widget.c widget.h win.c win.h wtools.c wtools.h \
- charsets.c charsets.h selcodepage.c selcodepage.h
+ unixcompat.h x11conn.h x11conn.c charsets.c charsets.h \
+ selcodepage.c selcodepage.h
am__objects_1 = achown.$(OBJEXT) background.$(OBJEXT) boxes.$(OBJEXT) \
chmod.$(OBJEXT) chown.$(OBJEXT) cmd.$(OBJEXT) color.$(OBJEXT) \
command.$(OBJEXT) complete.$(OBJEXT) cons.handler.$(OBJEXT) \
@@ -299,7 +301,7 @@ am__objects_1 = achown.$(OBJEXT) backgro
subshell.$(OBJEXT) textconf.$(OBJEXT) tree.$(OBJEXT) \
treestore.$(OBJEXT) user.$(OBJEXT) util.$(OBJEXT) \
utilunix.$(OBJEXT) view.$(OBJEXT) widget.$(OBJEXT) \
- win.$(OBJEXT) wtools.$(OBJEXT)
+ win.$(OBJEXT) wtools.$(OBJEXT) x11conn.$(OBJEXT)
am__objects_2 = charsets.$(OBJEXT) selcodepage.$(OBJEXT)
@[EMAIL PROTECTED] = $(am__objects_1) $(am__objects_2)
@[EMAIL PROTECTED] = $(am__objects_1)
@@ -388,7 +390,8 @@ am__depfiles_maybe = depfiles
@AMDEP_TRUE@ ./$(DEPDIR)/treestore.Po ./$(DEPDIR)/user.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/util.Po ./$(DEPDIR)/utilunix.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/view.Po ./$(DEPDIR)/widget.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/win.Po ./$(DEPDIR)/wtools.Po
[EMAIL PROTECTED]@ ./$(DEPDIR)/win.Po ./$(DEPDIR)/wtools.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/x11conn.Po
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
@@ -538,6 +541,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo \
--- src/key.c.000 2005-03-25 10:32:24.0 +0100
+++ src/key.c 2005-03-25 10:38:24.0 +0100
@@ -22,14 +22,15 @@
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include config.h
-#include stdio.h
-#include sys/types.h
-#include string.h
-#ifdef HAVE_UNISTD_H
-# include unistd.h
-#endif
+
#include ctype.h
#include errno.h
+#include stdio.h
+#include stdlib.h
+#include string.h
+
+#include sys/types.h
+#include unistd.h
#include global.h
#include tty.h
@@ -44,10 +45,7 @@
#endif
#ifdef HAVE_TEXTMODE_X11_SUPPORT
-#ifdef HAVE_GMODULE
-#include gmodule.h
-#endif /* HAVE_GMODULE */
-#include X11/Xlib.h
+#include x11conn.h
#endif
#ifdef __linux__
@@ -405,52 +403,16 @@ define_sequences (key_define_t *kd)
#ifdef HAVE_TEXTMODE_X11_SUPPORT
-#ifdef HAVE_GMODULE
-static int (*func_XCloseDisplay) (Display *);
-static Bool (*func_XQueryPointer) (Display *, Window, Window *, Window *,
- int *, int *, int *, int *,
- unsigned int *);
-
-static GModule *x11_module;
-#endif/* HAVE_GMODULE */
-
static Display *x11_display;
static Window x11_window;
static void
init_key_x11 (void)
{
-#ifdef HAVE_GMODULE
