first = hashmap_get(m->client->matches, m->match);
LIST_REMOVE(matches, first, m);
if (first)
- assert_se(hashmap_replace(m->client->matches, m->match, first) >= 0);
+ assert_se(hashmap_replace(m->client->matches, first->match, first) >= 0);
else
hashmap_remove(m->client->matches, m->match);
if (r < 0)
return r;
- return sd_bus_call(bus, msg, 0, NULL, NULL);
+ r = sd_bus_call(bus, msg, 0, NULL, NULL);
+ if (r < 0)
+ return r;
+
+ return sd_bus_reply_method_return(m, NULL);
}
static int driver_unsupported(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus_error *error) {
SD_BUS_VTABLE_END
};
+static int find_object(
+ sd_bus *bus,
+ const char *path,
+ const char *interface,
+ void *userdata,
+ void **ret_found,
+ sd_bus_error *ret_error) {
+
+ /* We support the driver interface on exactly two different
+ * paths: the root and the entry point object. This is a bit
+ * different from the original dbus-daemon which supported it
+ * on any path. */
+
+ if (streq_ptr(path, "/"))
+ return 1;
+
+ if (streq_ptr(path, "/org/freedesktop/DBus"))
+ return 1;
+
+ return 0;
+}
+
+static int node_enumerator(
+ sd_bus *bus,
+ const char *path,
+ void *userdata,
+ char ***ret_nodes,
+ sd_bus_error *ret_error) {
+
+ char **l;
+
+ l = strv_new("/", "/org/freedesktop/DBus", NULL);
+ if (!l)
+ return -ENOMEM;
+
+ *ret_nodes = l;
+ return 0;
+}
+
static int connect_bus(Context *c) {
int r;
assert(c);
- r = cg_pid_get_owner_uid(0, NULL);
- if (r < 0)
- r = sd_bus_default_system(&c->bus);
- else
- r = sd_bus_default_user(&c->bus);
+ r = sd_bus_default(&c->bus);
if (r < 0) {
log_error("Failed to create bus: %s", strerror(-r));
return r;
return -EPERM;
}
- r = sd_bus_add_object_vtable(c->bus, "/org/freedesktop/DBus", "org.freedesktop.DBus", driver_vtable, c);
+ r = sd_bus_add_fallback_vtable(c->bus, "/", "org.freedesktop.DBus", driver_vtable, find_object, c);
if (r < 0) {
log_error("Failed to add manager object vtable: %s", strerror(-r));
return r;
}
+ r = sd_bus_add_node_enumerator(c->bus, "/", node_enumerator, c);
+ if (r < 0) {
+ log_error("Failed to add node enumerator: %s", strerror(-r));
+ return r;
+ }
+
r = sd_bus_request_name(c->bus, "org.freedesktop.DBus", 0);
if (r < 0) {
log_error("Unable to request name: %s", strerror(-r));