aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog3
-rw-r--r--debian/patches/211_nxcomp_set_default_options.patch27
-rw-r--r--debian/patches/series1
3 files changed, 31 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 93d6d7ad6..907f673f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -50,6 +50,9 @@ nx-libs (2:3.5.0.25-0x2go1) UNRELEASED; urgency=low
specified by "state" option in agent options file. If option is omitted,
session state will not be saved. Session states are: STARTING, RUNNING,
SUSPENDING, SUSPENDED, RESUMING, TERMINATING, TERMINATED.
+ * Add 211_nxcomp_set_default_options.patch. Set default arguments for options
+ 'link' and 'pack' to avoid session damage by resuming with incorrect options
+ file.
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 07 May 2014 09:58:10 +0200
diff --git a/debian/patches/211_nxcomp_set_default_options.patch b/debian/patches/211_nxcomp_set_default_options.patch
new file mode 100644
index 000000000..9178fb5bf
--- /dev/null
+++ b/debian/patches/211_nxcomp_set_default_options.patch
@@ -0,0 +1,27 @@
+Description: Set default pack and link options to avoid damage of session.
+Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>
+
+--- a/nxcomp/Loop.cpp
++++ b/nxcomp/Loop.cpp
+@@ -8350,8 +8350,8 @@
+
+ cerr << "Error" << ": Can't identify 'link' option in string '"
+ << value << "'.\n";
+-
+- return -1;
++ if (ParseLinkOption("adsl") < 0)
++ return -1;
+ }
+ }
+ else if (strcasecmp(name, "limit") == 0)
+@@ -8809,8 +8809,8 @@
+
+ cerr << "Error" << ": Can't identify pack method for string '"
+ << value << "'.\n";
+-
+- return -1;
++ if (ParsePackOption("nopack")<0)
++ return -1;
+ }
+ }
+ else if (strcasecmp(name, "core") == 0)
diff --git a/debian/patches/series b/debian/patches/series
index 25f20ddaf..0689392cd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -66,3 +66,4 @@
016_nx-X11_install-location.debian.patch
102_xserver-xext_set-securitypolicy-path.debian.patch
210_nxagent_nxcomp_save_session_state.patch
+211_nxcomp_set_default_options.patch