From 0575a5b3d302912f13825393c3f9f165023d5927 Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ionic@ionic.de>
Date: Tue, 26 May 2015 18:56:12 +0200
Subject: nxcomp: fix DEBUG, TEST, DUMP, FLUSH, TOKEN, PING, MIXED et al
 builds.

Submitted by Nito Martinez of the Qindel Group.

Backported from Arctica GH 3.6.x branch.

Adds:
  - 0992_fix-DEBUG-TEST-DUMP-FLUSH-TOKEN-PING-et-al-builds.full+lite.patch
---
 ...P-FLUSH-TOKEN-PING-et-al-builds.full+lite.patch | 52 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 53 insertions(+)
 create mode 100644 debian/patches/0992_fix-DEBUG-TEST-DUMP-FLUSH-TOKEN-PING-et-al-builds.full+lite.patch

diff --git a/debian/patches/0992_fix-DEBUG-TEST-DUMP-FLUSH-TOKEN-PING-et-al-builds.full+lite.patch b/debian/patches/0992_fix-DEBUG-TEST-DUMP-FLUSH-TOKEN-PING-et-al-builds.full+lite.patch
new file mode 100644
index 000000000..4dcc34ca0
--- /dev/null
+++ b/debian/patches/0992_fix-DEBUG-TEST-DUMP-FLUSH-TOKEN-PING-et-al-builds.full+lite.patch
@@ -0,0 +1,52 @@
+From cf4ed917e2d7d6b3683ba1aa4ea4662538b69516 Mon Sep 17 00:00:00 2001
+From: Nito Martinez <Nito@Qindel.ES>
+Date: Fri, 15 May 2015 22:40:05 +0200
+Subject: [PATCH] This patch is some code fixes to debug some debuging macro
+ usage in the NX code.
+
+Particularly the following macros have been tested -DTEST -DDEBUG -DDUMP -DFLUSH -DTOKEN -DSPLIT -DPING -DMIXED -DMATCH -DTIME
+---
+ nxcomp/Agent.h       | 2 +-
+ nxcomp/ClearArea.cpp | 2 +-
+ nxcomp/Proxy.cpp     | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/nxcomp/Agent.h b/nxcomp/Agent.h
+index ded344d..2c5badf 100644
+--- a/nxcomp/Agent.h
++++ b/nxcomp/Agent.h
+@@ -217,7 +217,7 @@ class Agent
+ 
+     #if defined(TEST) || defined(INFO)
+     *logofs << "Agent: proxyCanRead() is "
+-            << ((int) FD_ISSET(proxy -> getFd(), &readWorkSet)
++            << ((int) FD_ISSET(proxy -> getFd(), &readWorkSet))
+             << ".\n" << logofs_flush;
+     #endif
+ 
+diff --git a/nxcomp/ClearArea.cpp b/nxcomp/ClearArea.cpp
+index 223a3b3..83b7281 100644
+--- a/nxcomp/ClearArea.cpp
++++ b/nxcomp/ClearArea.cpp
+@@ -92,7 +92,7 @@ void ClearAreaStore::dumpIdentity(const Message *message) const
+ 
+   ClearAreaMessage *clearArea = (ClearAreaMessage *) message;
+ 
+-  *logofs << name() << ": Identity exposures " << clearArea -> (unsigned int) exposures 
++  *logofs << name() << ": Identity exposures " << (unsigned int) clearArea -> exposures 
+           << ", window " << clearArea -> window  << ", x " << clearArea -> x 
+           << ", y " << clearArea -> y << ", width  " << clearArea -> width 
+           << ", height " << clearArea -> height << ", size " << clearArea -> size_ 
+diff --git a/nxcomp/Proxy.cpp b/nxcomp/Proxy.cpp
+index 9b38661..4eb99cf 100644
+--- a/nxcomp/Proxy.cpp
++++ b/nxcomp/Proxy.cpp
+@@ -5176,7 +5176,7 @@ char *Proxy::handleSaveAllStores(const char *savePath) const
+ 
+   *(cacheDumpName + DEFAULT_STRING_LENGTH - 1) = '\0';
+ 
+-  mode_t fileMode = umask(0077);
++  fileMode = umask(0077);
+ 
+   cacheDump = new ofstream(cacheDumpName, ios::out);
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 763eb0547..42663b1a2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -84,6 +84,7 @@
 0990_fix-DEBUG-and-TEST-builds.full.patch
 0991_fix-hr-typos.full+lite.patch
 0991_fix-hr-typos.full.patch
+0992_fix-DEBUG-TEST-DUMP-FLUSH-TOKEN-PING-et-al-builds.full+lite.patch
 0999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch
 1001-LZW-decompress-fix-for-CVE-2011-2895-From-xorg-.full.patch
 1002-Fix-CVE-2011-4028-File-disclosure-vulnerability.full.patch
-- 
cgit v1.2.3