[X2Go-Commits] [nx-libs] 20/24: Set default pack and link options to avoid damage of session (211_nxcomp_set_default_options.full+lite.patch).

git-admin at x2go.org git-admin at x2go.org
Tue Feb 10 21:50:59 CET 2015


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 46c2aebca5196ad4c10bb4f6f2558d656c22f5d9
Author: Oleksandr Shneyder <o.shneyder at phoca-gmbh.de>
Date:   Tue Feb 10 19:46:04 2015 +0100

    Set default pack and link options to avoid damage of session (211_nxcomp_set_default_options.full+lite.patch).
---
 .../211_nxcomp_set_default_options.full+lite.patch |   27 --------------------
 debian/patches/series                              |    1 -
 nxcomp/Loop.cpp                                    |    8 +++---
 3 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/debian/patches/211_nxcomp_set_default_options.full+lite.patch b/debian/patches/211_nxcomp_set_default_options.full+lite.patch
deleted file mode 100644
index 7bd8a78..0000000
--- a/debian/patches/211_nxcomp_set_default_options.full+lite.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Set default pack and link options to avoid damage of session.
-Author: Oleksandr Shneyder <o.shneyder at phoca-gmbh.de>
-
---- a/nxcomp/Loop.cpp
-+++ b/nxcomp/Loop.cpp
-@@ -8328,8 +8328,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)
-@@ -8783,8 +8783,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 9e0e647..0174ca1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-211_nxcomp_set_default_options.full+lite.patch
 212_nxcomp_build-on-Android.full+lite.patch
 220_nxproxy_bind-loopback-only.full+lite.patch
 300_nxagent_set-wm-class.full.patch
diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index 12a858b..d5c8eb2 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -8328,8 +8328,8 @@ int ParseEnvironmentOptions(const char *env, int force)
 
         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)
@@ -8783,8 +8783,8 @@ int ParseEnvironmentOptions(const char *env, int force)
 
         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)

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git


More information about the x2go-commits mailing list