From 6cbc9a79320c37fda61706444de295ed820c432b Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Thu, 16 Jun 2016 22:29:16 +0200 Subject: [PATCH] dbus proxy: Don't store the temporary sockets in $XDG_RUN_DIR/bus-proxy This just causes us to leave this empty directory around. Instead we use hidden files directly in $XDG_RUN_DIR/. --- common/flatpak-run.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/common/flatpak-run.c b/common/flatpak-run.c index a549d66b..fa48640a 100644 --- a/common/flatpak-run.c +++ b/common/flatpak-run.c @@ -1534,13 +1534,9 @@ flatpak_run_add_pulseaudio_args (GPtrArray *argv_array, static char * create_proxy_socket (char *template) { - g_autofree char *dir = g_build_filename (g_get_user_runtime_dir (), "bus-proxy", NULL); - g_autofree char *proxy_socket = g_build_filename (dir, template, NULL); + g_autofree char *proxy_socket = g_build_filename (g_get_user_runtime_dir (), template, NULL); int fd; - if (mkdir (dir, 0700) == -1 && errno != EEXIST) - return NULL; - fd = g_mkstemp (proxy_socket); if (fd == -1) return NULL; @@ -1578,7 +1574,7 @@ flatpak_run_add_system_dbus_args (FlatpakContext *context, else if (dbus_proxy_argv && g_hash_table_size (context->system_bus_policy) > 0) { - g_autofree char *proxy_socket = create_proxy_socket ("system-bus-proxy-XXXXXX"); + g_autofree char *proxy_socket = create_proxy_socket (".system-bus-proxy-XXXXXX"); if (proxy_socket == NULL) return FALSE; @@ -1629,7 +1625,7 @@ flatpak_run_add_session_dbus_args (GPtrArray *argv_array, } else if (dbus_proxy_argv && dbus_address != NULL) { - g_autofree char *proxy_socket = create_proxy_socket ("session-bus-proxy-XXXXXX"); + g_autofree char *proxy_socket = create_proxy_socket (".session-bus-proxy-XXXXXX"); if (proxy_socket == NULL) return FALSE;