summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2016-01-28 10:52:21 -0500
committerLibravatar netblue30 <netblue30@yahoo.com>2016-01-28 10:52:21 -0500
commit6203399200f8ccff6841d7eaa997f00d053294f6 (patch)
tree4642a427028889b74df4819330081d9fc6be0c5d
parentMerge pull request #265 from pszxzsd/uget (diff)
downloadfirejail-6203399200f8ccff6841d7eaa997f00d053294f6.tar.gz
firejail-6203399200f8ccff6841d7eaa997f00d053294f6.tar.zst
firejail-6203399200f8ccff6841d7eaa997f00d053294f6.zip
the first protocol list requested takes precedence
-rw-r--r--RELNOTES3
-rw-r--r--src/firejail/protocol.c5
2 files changed, 8 insertions, 0 deletions
diff --git a/RELNOTES b/RELNOTES
index 2530a7a06..dca08ef02 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -5,6 +5,9 @@ firejail (0.9.37) baseline; urgency=low
5 * added --disable-network and --disable-userns compile time flags 5 * added --disable-network and --disable-userns compile time flags
6 * symlink invocation 6 * symlink invocation
7 * added KMail, Seamonkey, Telegram, Mathematica, uGet profiles 7 * added KMail, Seamonkey, Telegram, Mathematica, uGet profiles
8 * --chroot in user mode allowed only if seccomp support is available
9 * in current Linux kernel
10 * the first protocol list installed takes precedence
8 * --tmpfs option allowed only running as root 11 * --tmpfs option allowed only running as root
9 * added --private-tmp option 12 * added --private-tmp option
10 * bugfixes 13 * bugfixes
diff --git a/src/firejail/protocol.c b/src/firejail/protocol.c
index e6a8f61ab..407f8c62d 100644
--- a/src/firejail/protocol.c
+++ b/src/firejail/protocol.c
@@ -119,6 +119,11 @@ void protocol_list(void) {
119void protocol_store(const char *prlist) { 119void protocol_store(const char *prlist) {
120 assert(prlist); 120 assert(prlist);
121 121
122 if (cfg.protocol) {
123 fprintf(stderr, "Warning: a protocol list is present, the new list \"%s\" will not be installed\n", prlist);
124 return;
125 }
126
122 // temporary list 127 // temporary list
123 char *tmplist = strdup(prlist); 128 char *tmplist = strdup(prlist);
124 if (!tmplist) 129 if (!tmplist)