Commit 4eae840b authored by Mike Gabriel's avatar Mike Gabriel

Add patch: 111_nxcomp_byerace.full+lite.patch. Work around race condition in qtnx and libnxcl.

parent 54792fe2
......@@ -2,6 +2,8 @@ nx-libs (2:3.5.0.11-0) UNRELEASED; urgency=low
* Use ,,$(MAKE) -C'' in main Makefile for calling Makefiles in subdirectories,
make build stanza work for nx-libs-full and nx-libs-lite.
* Add patch: 111_nxcomp_byerace.full+lite.patch. Work around race condition in
qtnx and libnxcl.
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 07 Feb 2012 13:48:19 +0100
......
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -7321,6 +7321,18 @@
<< logofs_flush;
#endif
+ // Henning Heinold
+ // fix up error from libnxcl where bye can be in front of NXPROXY
+ if (strncmp(options, "bye", strlen("bye")) == 0)
+ {
+ int bye_length = strlen("bye");
+ char *moo = &options[bye_length+1];
+
+ memmove(options, moo, DEFAULT_REMOTE_OPTIONS_LENGTH-bye_length-1);
+ *logofs << "Loop: Cleanded the bye in options, options now looks '"
+ << options << "'.\n" << logofs_flush;
+ }
+
if (strncmp(options, "NXPROXY-", strlen("NXPROXY-")) != 0)
{
#ifdef PANIC
......@@ -33,6 +33,7 @@
108_nxagent_wine-close-delay.full.patch
109_nxagent_locale-utf8-compound-text.full.patch
110_nxagent_createpixmap-bounds-check.full.patch
111_nxcomp_byerace.full+lite.patch
200_nxagent_check-binary-x2go-flavour.full.patch
201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch
202_nx-x11_enable-xinerama.full.patch
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment