From 6203399200f8ccff6841d7eaa997f00d053294f6 Mon Sep 17 00:00:00 2001
From: netblue30 <netblue30@yahoo.com>
Date: Thu, 28 Jan 2016 10:52:21 -0500
Subject: the first protocol list requested takes precedence

---
 RELNOTES                | 3 +++
 src/firejail/protocol.c | 5 +++++
 2 files changed, 8 insertions(+)

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
   * added --disable-network and --disable-userns compile time flags
   * symlink invocation
   * added KMail, Seamonkey, Telegram, Mathematica, uGet profiles
+  * --chroot in user mode allowed only if seccomp support is available
+  *   in current Linux kernel
+  * the first protocol list installed takes precedence
   * --tmpfs option allowed only running as root
   * added --private-tmp option
   * 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) {
 void protocol_store(const char *prlist) {
 	assert(prlist);
 	
+	if (cfg.protocol) {
+		fprintf(stderr, "Warning: a protocol list is present, the new list \"%s\" will not be installed\n", prlist);
+		return;
+	}
+	
 	// temporary list
 	char *tmplist = strdup(prlist);
 	if (!tmplist)
-- 
cgit v1.2.3-70-g09d2