From d0316b7a0d356ba12325ce5a00b0cbe0bc359461 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Tue, 22 Oct 2024 11:12:17 +0200 Subject: [PATCH] bus-util: Special case when DBUS_SESSION_BUS_ADDRESS is set and XDG_RUNTIME_DIR isn't We noticed some failures because we have code that connects to user managers by setting DBUS_SESSION_BUS_ADDRESS without setting XDG_RUNTIME_DIR. If that's the case, connect to the user session bus instead of the private manager bus as we can't connect to the latter if XDG_RUNTIME_DIR is not set. --- src/shared/bus-util.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c index 57c60dcb67..fa4f879b7b 100644 --- a/src/shared/bus-util.c +++ b/src/shared/bus-util.c @@ -496,6 +496,8 @@ int bus_connect_transport_systemd( RuntimeScope runtime_scope, sd_bus **ret_bus) { + int r; + assert(transport >= 0); assert(transport < _BUS_TRANSPORT_MAX); assert(ret_bus); @@ -508,7 +510,15 @@ int bus_connect_transport_systemd( switch (runtime_scope) { case RUNTIME_SCOPE_USER: - return bus_connect_user_systemd(ret_bus); + r = bus_connect_user_systemd(ret_bus); + /* We used to always fall back to the user session bus if we couldn't connect to the + * private manager bus. To keep compat with existing code that was setting + * DBUS_SESSION_BUS_ADDRESS without setting XDG_RUNTIME_DIR, connect to the user + * session bus if DBUS_SESSION_BUS_ADDRESS is set and XDG_RUNTIME_DIR isn't. */ + if (r == -ENOMEDIUM && secure_getenv("DBUS_SESSION_BUS_ADDRESS")) + r = sd_bus_default_user(ret_bus); + + return r; case RUNTIME_SCOPE_SYSTEM: if (sd_booted() <= 0) -- 2.25.1