SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bus-util: Special case when DBUS_SESSION_BUS_ADDRESS is set and XDG_RUNTIME_DIR isn't

Browse Source 
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.
This commit is contained in:
Daan De Meyer
2024-10-22 11:17:40 +02:00
parent c5698fe907
commit d0316b7a0d
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/bus-util.c
+11 -1
View File
@@ -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)