Add options for D-Bus logging

--dbus-user.log and --dbus-system.log instruct xdg-dbus-proxy to log
interactions with the session and system buses, respectively.
--dbus-log= can specify the location of the log file. If no location is
specified, log output is written to stdout.

1 files changed, 8 insertions, 0 deletions

diff --git a/src/firejail/profile.c b/src/firejail/profile.c
index 699ca4bea..749006487 100644
--- a/src/firejail/profile.c
+++ b/src/firejail/profile.c
@@ -445,6 +445,10 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
                         }
                         arg_dbus_user = DBUS_POLICY_FILTER;
                 } else if (strcmp("none", ptr) == 0) {
+                        if (arg_dbus_log_user) {
+                                fprintf(stderr, "Error: --dbus-user.log requires --dbus-user=filter\n");
+                                exit(1);
+                        }
                         arg_dbus_user = DBUS_POLICY_BLOCK;
                 } else {
                         fprintf(stderr, "Unknown dbus-user policy: %s\n", ptr);
@@ -496,6 +500,10 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
                         }
                         arg_dbus_system = DBUS_POLICY_FILTER;
                 } else if (strcmp("none", ptr) == 0) {
+                        if (arg_dbus_log_system) {
+                                fprintf(stderr, "Error: --dbus-system.log requires --dbus-system=filter\n");
+                                exit(1);
+                        }
                         arg_dbus_system = DBUS_POLICY_BLOCK;
                 } else {
                         fprintf(stderr, "Unknown dbus-system policy: %s\n", ptr);