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

sd-bus: when connecting to a container, don't fall back to host bus

Browse Source 
We should never connect to the host bus as fallback if connecting to a
container failed via one method. Otherwise connecting to a dbus1
container will always result in a connection to the host.
This commit is contained in:
Lennart Poettering
2015-09-01 20:40:24 +02:00
parent 80b0d3e311
commit 751090cc8a
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-bus/sd-bus.c
+17 -6
View File
@@ -1025,19 +1025,30 @@ static int bus_start_address(sd_bus *b) {
if (b->exec_path)
r = bus_socket_exec(b);
else if ((b->nspid > 0 || b->machine) && b->kernel) {
r = bus_container_connect_kernel(b);
if (r < 0 && !IN_SET(r, -ENOENT, -ESOCKTNOSUPPORT))
container_kdbus_available = true;
} else if (!container_kdbus_available && (b->nspid > 0 || b->machine) && b->sockaddr.sa.sa_family != AF_UNSPEC)
r = bus_container_connect_socket(b);
else if (b->kernel) {
} else if ((b->nspid > 0 || b->machine) && b->sockaddr.sa.sa_family != AF_UNSPEC) {
if (!container_kdbus_available)
r = bus_container_connect_socket(b);
else
skipped = true;
} else if (b->kernel) {
r = bus_kernel_connect(b);
if (r < 0 && !IN_SET(r, -ENOENT, -ESOCKTNOSUPPORT))
kdbus_available = true;
} else if (!kdbus_available && b->sockaddr.sa.sa_family != AF_UNSPEC)
r = bus_socket_connect(b);
else
} else if (b->sockaddr.sa.sa_family != AF_UNSPEC) {
if (!kdbus_available)
r = bus_socket_connect(b);
else
skipped = true;
} else
skipped = true;
if (!skipped) {