merge: nodbus-enhancements (laomaiwend, May 17)

1 files changed, 7 insertions, 1 deletions

diff --git a/src/firejail/dbus.c b/src/firejail/dbus.c
index 6c122c6d0..20a8e5277 100644
--- a/src/firejail/dbus.c
+++ b/src/firejail/dbus.c
@@ -29,7 +29,7 @@ void dbus_session_disable(void) {
         if (asprintf(&path, "/run/user/%d/bus", getuid()) == -1)
                 errExit("asprintf");
         char *env_var;
-        if (asprintf(&env_var, "DBUS_SESSION_BUS_ADDRESS=unix:path=%s", path) == -1)
+        if (asprintf(&env_var, "unix:path=%s", path) == -1)
                 errExit("asprintf");
 
         // set a new environment variable: DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/<UID>/bus
@@ -43,6 +43,12 @@ void dbus_session_disable(void) {
         free(path);
         free(env_var);
 
+        // blacklist the dbus-launch user directory
+        if (asprintf(&path, "%s/.dbus", cfg.homedir) == -1)
+                errExit("asprintf");
+        disable_file_or_dir(path);
+        free(path);
+
         // look for a possible abstract unix socket
 
         // --net=none