assert(m);
+#ifdef ENABLE_KDBUS
if (m->kdbus_fd >= 0)
return 0;
if (m->running_as == SYSTEMD_USER && getenv("DBUS_SESSION_BUS_ADDRESS"))
return 0;
- m->kdbus_fd = bus_kernel_create(m->running_as == SYSTEMD_SYSTEM ? "system" : "user", &p);
+ m->kdbus_fd = bus_kernel_create_bus(m->running_as == SYSTEMD_SYSTEM ? "system" : "user", &p);
if (m->kdbus_fd < 0) {
log_debug("Failed to set up kdbus: %s", strerror(-m->kdbus_fd));
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;
}
} else if (startswith(l, "kdbus-fd=")) {
int fd;
- if (safe_atoi(l + 9, &fd) < 0 || !fdset_contains(fds, fd))
+ if (safe_atoi(l + 9, &fd) < 0 || fd < 0 || !fdset_contains(fds, fd))
log_debug("Failed to parse kdbus fd: %s", l + 9);
else {
if (m->kdbus_fd >= 0)