aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOleksandr Shneyder <o.shneyder@phoca-gmbh.de>2015-02-10 19:46:04 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-10 19:46:04 +0100
commit46c2aebca5196ad4c10bb4f6f2558d656c22f5d9 (patch)
tree0c61e9de93714f4ccf6f20d98b72e4e7472eb5e1
parent8c1b852abf692af4898368132292eb8c7278a7c2 (diff)
downloadnx-libs-46c2aebca5196ad4c10bb4f6f2558d656c22f5d9.tar.gz
nx-libs-46c2aebca5196ad4c10bb4f6f2558d656c22f5d9.tar.bz2
nx-libs-46c2aebca5196ad4c10bb4f6f2558d656c22f5d9.zip
Set default pack and link options to avoid damage of session (211_nxcomp_set_default_options.full+lite.patch).
-rw-r--r--debian/patches/211_nxcomp_set_default_options.full+lite.patch27
-rw-r--r--debian/patches/series1
-rw-r--r--nxcomp/Loop.cpp8
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 7bd8a781d..000000000
--- 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@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 9e0e64701..0174ca194 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 12a858b0f..d5c8eb25d 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)