dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-05 15:40:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

bus: don't make use of the private bus socket if kdbus is available

Browse Source
This commit is contained in:
Lennart Poettering
2013-12-03 19:55:51 +01:00
parent 0e7be1293f
commit a6aa89122d
3 changed files with 59 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/dbus.c
View File

@@ -938,6 +938,10 @@ static int bus_init_private(Manager *m) {
if (m->private_listen_fd >= 0)
return 0;
/* We don't need the private socket if we have kdbus */
if (m->kdbus_fd >= 0)
return 0;
if (m->running_as == SYSTEMD_SYSTEM) {
/* We want the private bus only when running as init */

2
src/core/manager.c
View File

@@ -428,7 +428,7 @@ static int manager_setup_kdbus(Manager *m) {
return m->kdbus_fd;
}
log_info("Successfully set up kdbus on %s", p);
log_debug("Successfully set up kdbus on %s", p);
#endif
return 0;

67
src/libsystemd-bus/bus-util.c
View File

@@ -439,8 +439,30 @@ int bus_open_system_systemd(sd_bus **_bus) {
if (geteuid() != 0)
return sd_bus_open_system(_bus);
/* If we are root, then let's talk directly to the system
* instance, instead of going via the bus */
/* If we are root and kdbus is not available, then let's talk
* directly to the system instance, instead of going via the
* bus */
#ifdef ENABLE_KDBUS
r = sd_bus_new(&bus);
if (r < 0)
return r;
r = sd_bus_set_address(bus, "kernel:path=/dev/kdbus/0-system/bus");
if (r < 0)
return r;
bus->bus_client = true;
r = sd_bus_start(bus);
if (r >= 0) {
*_bus = bus;
bus = NULL;
return 0;
}
bus = sd_bus_unref(bus);
#endif
r = sd_bus_new(&bus);
if (r < 0)
@@ -452,7 +474,7 @@ int bus_open_system_systemd(sd_bus **_bus) {
r = sd_bus_start(bus);
if (r < 0)
return r;
return sd_bus_open_system(_bus);
r = bus_check_peercred(bus);
if (r < 0)
@@ -466,34 +488,53 @@ int bus_open_system_systemd(sd_bus **_bus) {
int bus_open_user_systemd(sd_bus **_bus) {
_cleanup_bus_unref_ sd_bus *bus = NULL;
_cleanup_free_ char *p = NULL;
_cleanup_free_ char *ee = NULL;
const char *e;
int r;
/* If we are supposed to talk to the instance, try via
* XDG_RUNTIME_DIR first, then fallback to normal bus
* access */
/* Try via kdbus first, and then directly */
assert(_bus);
#ifdef ENABLE_KDBUS
r = sd_bus_new(&bus);
if (r < 0)
return r;
if (asprintf(&bus->address, "kernel:path=/dev/kdbus/%lu-user/bus", (unsigned long) getuid()) < 0)
return -ENOMEM;
bus->bus_client = true;
r = sd_bus_start(bus);
if (r >= 0) {
*_bus = bus;
bus = NULL;
return 0;
}
bus = sd_bus_unref(bus);
#endif
e = secure_getenv("XDG_RUNTIME_DIR");
if (!e)
return sd_bus_open_user(_bus);
return sd_bus_open_system(_bus);
if (asprintf(&p, "unix:path=%s/systemd/private", e) < 0)
ee = bus_address_escape(e);
if (!ee)
return -ENOMEM;
r = sd_bus_new(&bus);
if (r < 0)
return r;
r = sd_bus_set_address(bus, p);
if (r < 0)
return r;
bus->address = strjoin("unix:path=", ee, "/systemd/private", NULL);
if (!bus->address)
return -ENOMEM;
r = sd_bus_start(bus);
if (r < 0)
return r;
return sd_bus_open_system(_bus);
r = bus_check_peercred(bus);
if (r < 0)