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

Merge pull request #34851 from DaanDeMeyer/medium

Browse Source 
bus-util: Return ENOMEDIUM if XDG_RUNTIME_DIR is unset
This commit is contained in:
Daan De Meyer
2024-10-22 13:37:59 +02:00
committed by GitHub
parent 35f51be4f8 d64a5b30f1
commit a95aacc851
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/bus-util.c
+15 -5
View File
@@ -56,9 +56,9 @@ int bus_log_connect_error(int r, BusTransport transport, RuntimeScope scope) {
hint_addr = transport == BUS_TRANSPORT_LOCAL && ERRNO_IS_PRIVILEGE(r);
return log_error_errno(r,
r == hint_vars ? "Failed to connect to %s scope bus via %s transport: $DBUS_SESSION_BUS_ADDRESS and $XDG_RUNTIME_DIR not defined (consider using --machine=<user>@.host --user to connect to bus of other user)" :
r == hint_addr ? "Failed to connect to %s scope bus via %s transport: Operation not permitted (consider using --machine=<user>@.host --user to connect to bus of other user)" :
"Failed to connect to %s scope bus via %s transport: %m", runtime_scope_to_string(scope), bus_transport_to_string(transport));
hint_vars ? "Failed to connect to %s scope bus via %s transport: $DBUS_SESSION_BUS_ADDRESS and $XDG_RUNTIME_DIR not defined (consider using --machine=<user>@.host --user to connect to bus of other user)" :
hint_addr ? "Failed to connect to %s scope bus via %s transport: Operation not permitted (consider using --machine=<user>@.host --user to connect to bus of other user)" :
"Failed to connect to %s scope bus via %s transport: %m", runtime_scope_to_string(scope), bus_transport_to_string(transport));
}
int bus_async_unregister_and_exit(sd_event *e, sd_bus *bus, const char *name) {
@@ -259,7 +259,7 @@ int bus_connect_user_systemd(sd_bus **ret_bus) {
e = secure_getenv("XDG_RUNTIME_DIR");
if (!e)
return -ENXIO;
return -ENOMEDIUM;
ee = bus_address_escape(e);
if (!ee)
@@ -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)