bus: add API calls for connecting to starter bus

[elogind.git] / src / bus-driverd / bus-driverd.c

diff --git a/src/bus-driverd/bus-driverd.c b/src/bus-driverd/bus-driverd.c
index 46a5b10974847b8384e95f4b9a7592cfa5686f95..acb5e6ba00d574f9a07f49cbd998602c5c89da83 100644 (file)
--- a/src/bus-driverd/bus-driverd.c
+++ b/src/bus-driverd/bus-driverd.c
@@ -93,7 +93,7 @@ static void match_free(Match *m) {
                 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);
 
@@ -130,10 +130,7 @@ static int match_new(Client *c, struct bus_match_component *components, unsigned
         first = hashmap_get(c->matches, m->match);
         LIST_PREPEND(matches, first, m);
         r = hashmap_replace(c->matches, m->match, first);
-        if (r == 0) {
-                log_debug("Match '%s' already installed, ignoring request.", m->match);
-                LIST_REMOVE(matches, first, m);
-        } else if (r < 0) {
+        if (r < 0) {
                 LIST_REMOVE(matches, first, m);
                 goto fail;
         }
@@ -806,16 +803,51 @@ static const sd_bus_vtable driver_vtable[] = {
         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;
@@ -826,12 +858,18 @@ static int connect_bus(Context *c) {
                 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));