aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--contrib/syntax/lists/profile_commands_arg1.list3
-rw-r--r--src/firejail/profile.c4
3 files changed, 6 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 450b8a0b4..d5ec11ea6 100644
--- a/Makefile
+++ b/Makefile
@@ -111,7 +111,7 @@ contrib/syntax/lists/profile_commands_arg0.list: src/firejail/profile.c Makefile
111# TODO: private-lib is special-cased in the code and doesn't match the regex 111# TODO: private-lib is special-cased in the code and doesn't match the regex
112contrib/syntax/lists/profile_commands_arg1.list: src/firejail/profile.c Makefile 112contrib/syntax/lists/profile_commands_arg1.list: src/firejail/profile.c Makefile
113 @printf 'Generating %s from %s\n' $@ $< 113 @printf 'Generating %s from %s\n' $@ $<
114 @{ sed -En 's/.*strn?cmp\(ptr, "([^"]+) ".*/\1/p' $<; \ 114 @{ sed -En 's/.*strn?cmp\(ptr, "([^"]+) .*/\1/p' $<; \
115 echo private-lib; } | LC_ALL=C sort -u >$@ 115 echo private-lib; } | LC_ALL=C sort -u >$@
116 116
117contrib/syntax/lists/profile_conditionals.list: src/firejail/profile.c Makefile 117contrib/syntax/lists/profile_conditionals.list: src/firejail/profile.c Makefile
diff --git a/contrib/syntax/lists/profile_commands_arg1.list b/contrib/syntax/lists/profile_commands_arg1.list
index 28913542f..5862f16ac 100644
--- a/contrib/syntax/lists/profile_commands_arg1.list
+++ b/contrib/syntax/lists/profile_commands_arg1.list
@@ -5,11 +5,13 @@ blacklist-nolog
5caps.drop 5caps.drop
6caps.keep 6caps.keep
7cpu 7cpu
8dbus-system
8dbus-system.broadcast 9dbus-system.broadcast
9dbus-system.call 10dbus-system.call
10dbus-system.own 11dbus-system.own
11dbus-system.see 12dbus-system.see
12dbus-system.talk 13dbus-system.talk
14dbus-user
13dbus-user.broadcast 15dbus-user.broadcast
14dbus-user.call 16dbus-user.call
15dbus-user.own 17dbus-user.own
@@ -74,4 +76,5 @@ tmpfs
74veth-name 76veth-name
75whitelist 77whitelist
76whitelist-ro 78whitelist-ro
79x11
77xephyr-screen 80xephyr-screen
diff --git a/src/firejail/profile.c b/src/firejail/profile.c
index bdaaed433..8cc5c1166 100644
--- a/src/firejail/profile.c
+++ b/src/firejail/profile.c
@@ -484,7 +484,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
484#endif 484#endif
485 return 0; 485 return 0;
486 } 486 }
487 else if (strncmp("dbus-user ", ptr, 10) == 0) { 487 else if (strncmp(ptr, "dbus-user ", 10) == 0) {
488#ifdef HAVE_DBUSPROXY 488#ifdef HAVE_DBUSPROXY
489 ptr += 10; 489 ptr += 10;
490 if (strcmp("filter", ptr) == 0) { 490 if (strcmp("filter", ptr) == 0) {
@@ -551,7 +551,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
551#endif 551#endif
552 return 1; 552 return 1;
553 } 553 }
554 else if (strncmp("dbus-system ", ptr, 12) == 0) { 554 else if (strncmp(ptr, "dbus-system ", 12) == 0) {
555#ifdef HAVE_DBUSPROXY 555#ifdef HAVE_DBUSPROXY
556 ptr += 12; 556 ptr += 12;
557 if (strcmp("filter", ptr) == 0) { 557 if (strcmp("filter", ptr) == 0) {