aboutsummaryrefslogtreecommitdiffstats
path: root/src/firejail/profile.c
diff options
context:
space:
mode:
authorLibravatar Kristóf Marussy <kristof@marussy.com>2020-05-09 01:55:11 +0200
committerLibravatar Kristóf Marussy <kristof@marussy.com>2020-05-09 01:56:10 +0200
commit9a430b94d8e2b5ec4b8027a62072bc9d02136128 (patch)
treeee1b426c48ccd7e88a95fb75d37ce7ee038c1f05 /src/firejail/profile.c
parentDocumentation for new DBus options (diff)
downloadfirejail-9a430b94d8e2b5ec4b8027a62072bc9d02136128.tar.gz
firejail-9a430b94d8e2b5ec4b8027a62072bc9d02136128.tar.zst
firejail-9a430b94d8e2b5ec4b8027a62072bc9d02136128.zip
Turn attempted DBus policy downgrade into warning (fixes #3408)
Diffstat (limited to 'src/firejail/profile.c')
-rw-r--r--src/firejail/profile.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/firejail/profile.c b/src/firejail/profile.c
index 749006487..a87222824 100644
--- a/src/firejail/profile.c
+++ b/src/firejail/profile.c
@@ -441,9 +441,9 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
441 if (strcmp("filter", ptr) == 0) { 441 if (strcmp("filter", ptr) == 0) {
442 if (arg_dbus_user == DBUS_POLICY_BLOCK) { 442 if (arg_dbus_user == DBUS_POLICY_BLOCK) {
443 fprintf(stderr, "Error: Cannot relax dbus-user policy, it is already set to block\n"); 443 fprintf(stderr, "Error: Cannot relax dbus-user policy, it is already set to block\n");
444 exit(1); 444 } else {
445 arg_dbus_user = DBUS_POLICY_FILTER;
445 } 446 }
446 arg_dbus_user = DBUS_POLICY_FILTER;
447 } else if (strcmp("none", ptr) == 0) { 447 } else if (strcmp("none", ptr) == 0) {
448 if (arg_dbus_log_user) { 448 if (arg_dbus_log_user) {
449 fprintf(stderr, "Error: --dbus-user.log requires --dbus-user=filter\n"); 449 fprintf(stderr, "Error: --dbus-user.log requires --dbus-user=filter\n");
@@ -496,9 +496,9 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
496 if (strcmp("filter", ptr) == 0) { 496 if (strcmp("filter", ptr) == 0) {
497 if (arg_dbus_system == DBUS_POLICY_BLOCK) { 497 if (arg_dbus_system == DBUS_POLICY_BLOCK) {
498 fprintf(stderr, "Error: Cannot relax dbus-system policy, it is already set to block\n"); 498 fprintf(stderr, "Error: Cannot relax dbus-system policy, it is already set to block\n");
499 exit(1); 499 } else {
500 arg_dbus_system = DBUS_POLICY_FILTER;
500 } 501 }
501 arg_dbus_system = DBUS_POLICY_FILTER;
502 } else if (strcmp("none", ptr) == 0) { 502 } else if (strcmp("none", ptr) == 0) {
503 if (arg_dbus_log_system) { 503 if (arg_dbus_log_system) {
504 fprintf(stderr, "Error: --dbus-system.log requires --dbus-system=filter\n"); 504 fprintf(stderr, "Error: --dbus-system.log requires --dbus-system=filter\n");