X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fdbus.c;h=fb8e4963e1c004d1c3f1456bee0eef4bd1b4a5c1;hp=be8dfc90f859eed8d488816473310b22081f0942;hb=e70bc43cdf75b36e7ad3d29e9a6f8ee1461e7d5e;hpb=8f8f05a919355095518911135c3d630f4620a9b0 diff --git a/src/core/dbus.c b/src/core/dbus.c index be8dfc90f..fb8e4963e 100644 --- a/src/core/dbus.c +++ b/src/core/dbus.c @@ -239,7 +239,7 @@ static int selinux_filter(sd_bus *bus, sd_bus_message *message, void *userdata, if (object_path_startswith("/org/freedesktop/systemd1", path)) { - r = selinux_access_check(bus, message, verb, error); + r = selinux_access_check(message, verb, error); if (r < 0) return r; @@ -270,7 +270,7 @@ static int selinux_filter(sd_bus *bus, sd_bus_message *message, void *userdata, if (!u) return 0; - r = selinux_unit_access_check(u, bus, message, verb, error); + r = selinux_unit_access_check(u, message, verb, error); if (r < 0) return r; @@ -310,7 +310,7 @@ static int find_unit(Manager *m, sd_bus *bus, const char *path, Unit **unit, sd_ sd_bus_message *message; pid_t pid; - message = sd_bus_get_current(bus); + message = sd_bus_get_current_message(bus); if (!message) return 0; @@ -536,58 +536,58 @@ static int bus_setup_api_vtables(Manager *m, sd_bus *bus) { assert(bus); #ifdef HAVE_SELINUX - r = sd_bus_add_filter(bus, selinux_filter, m); + r = sd_bus_add_filter(bus, NULL, selinux_filter, m); if (r < 0) { log_error("Failed to add SELinux access filter: %s", strerror(-r)); return r; } #endif - r = sd_bus_add_object_vtable(bus, "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", bus_manager_vtable, m); + r = sd_bus_add_object_vtable(bus, NULL, "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", bus_manager_vtable, m); if (r < 0) { log_error("Failed to register Manager vtable: %s", strerror(-r)); return r; } - r = sd_bus_add_fallback_vtable(bus, "/org/freedesktop/systemd1/job", "org.freedesktop.systemd1.Job", bus_job_vtable, bus_job_find, m); + r = sd_bus_add_fallback_vtable(bus, NULL, "/org/freedesktop/systemd1/job", "org.freedesktop.systemd1.Job", bus_job_vtable, bus_job_find, m); if (r < 0) { log_error("Failed to register Job vtable: %s", strerror(-r)); return r; } - r = sd_bus_add_node_enumerator(bus, "/org/freedesktop/systemd1/job", bus_job_enumerate, m); + r = sd_bus_add_node_enumerator(bus, NULL, "/org/freedesktop/systemd1/job", bus_job_enumerate, m); if (r < 0) { log_error("Failed to add job enumerator: %s", strerror(-r)); return r; } - r = sd_bus_add_fallback_vtable(bus, "/org/freedesktop/systemd1/unit", "org.freedesktop.systemd1.Unit", bus_unit_vtable, bus_unit_find, m); + r = sd_bus_add_fallback_vtable(bus, NULL, "/org/freedesktop/systemd1/unit", "org.freedesktop.systemd1.Unit", bus_unit_vtable, bus_unit_find, m); if (r < 0) { log_error("Failed to register Unit vtable: %s", strerror(-r)); return r; } - r = sd_bus_add_node_enumerator(bus, "/org/freedesktop/systemd1/unit", bus_unit_enumerate, m); + r = sd_bus_add_node_enumerator(bus, NULL, "/org/freedesktop/systemd1/unit", bus_unit_enumerate, m); if (r < 0) { log_error("Failed to add job enumerator: %s", strerror(-r)); return r; } for (t = 0; t < _UNIT_TYPE_MAX; t++) { - r = sd_bus_add_fallback_vtable(bus, "/org/freedesktop/systemd1/unit", unit_vtable[t]->bus_interface, unit_vtable[t]->bus_vtable, bus_unit_interface_find, m); + r = sd_bus_add_fallback_vtable(bus, NULL, "/org/freedesktop/systemd1/unit", unit_vtable[t]->bus_interface, unit_vtable[t]->bus_vtable, bus_unit_interface_find, m); if (r < 0) { log_error("Failed to register type specific vtable for %s: %s", unit_vtable[t]->bus_interface, strerror(-r)); return r; } if (unit_vtable[t]->cgroup_context_offset > 0) { - r = sd_bus_add_fallback_vtable(bus, "/org/freedesktop/systemd1/unit", unit_vtable[t]->bus_interface, bus_unit_cgroup_vtable, bus_unit_cgroup_find, m); + r = sd_bus_add_fallback_vtable(bus, NULL, "/org/freedesktop/systemd1/unit", unit_vtable[t]->bus_interface, bus_unit_cgroup_vtable, bus_unit_cgroup_find, m); if (r < 0) { log_error("Failed to register control group unit vtable for %s: %s", unit_vtable[t]->bus_interface, strerror(-r)); return r; } - r = sd_bus_add_fallback_vtable(bus, "/org/freedesktop/systemd1/unit", unit_vtable[t]->bus_interface, bus_cgroup_vtable, bus_cgroup_context_find, m); + r = sd_bus_add_fallback_vtable(bus, NULL, "/org/freedesktop/systemd1/unit", unit_vtable[t]->bus_interface, bus_cgroup_vtable, bus_cgroup_context_find, m); if (r < 0) { log_error("Failed to register control group vtable for %s: %s", unit_vtable[t]->bus_interface, strerror(-r)); return r; @@ -595,7 +595,7 @@ static int bus_setup_api_vtables(Manager *m, sd_bus *bus) { } if (unit_vtable[t]->exec_context_offset > 0) { - r = sd_bus_add_fallback_vtable(bus, "/org/freedesktop/systemd1/unit", unit_vtable[t]->bus_interface, bus_exec_vtable, bus_exec_context_find, m); + r = sd_bus_add_fallback_vtable(bus, NULL, "/org/freedesktop/systemd1/unit", unit_vtable[t]->bus_interface, bus_exec_vtable, bus_exec_context_find, m); if (r < 0) { log_error("Failed to register execute vtable for %s: %s", unit_vtable[t]->bus_interface, strerror(-r)); return r; @@ -603,7 +603,7 @@ static int bus_setup_api_vtables(Manager *m, sd_bus *bus) { } if (unit_vtable[t]->kill_context_offset > 0) { - r = sd_bus_add_fallback_vtable(bus, "/org/freedesktop/systemd1/unit", unit_vtable[t]->bus_interface, bus_kill_vtable, bus_kill_context_find, m); + r = sd_bus_add_fallback_vtable(bus, NULL, "/org/freedesktop/systemd1/unit", unit_vtable[t]->bus_interface, bus_kill_vtable, bus_kill_context_find, m); if (r < 0) { log_error("Failed to register kill vtable for %s: %s", unit_vtable[t]->bus_interface, strerror(-r)); return r; @@ -622,6 +622,7 @@ static int bus_setup_disconnected_match(Manager *m, sd_bus *bus) { r = sd_bus_add_match( bus, + NULL, "sender='org.freedesktop.DBus.Local'," "type='signal'," "path='/org/freedesktop/DBus/Local'," @@ -710,6 +711,7 @@ static int bus_on_connection(sd_event_source *s, int fd, uint32_t revents, void r = sd_bus_add_match( bus, + NULL, "type='signal'," "interface='org.freedesktop.systemd1.Agent'," "member='Released'," @@ -780,6 +782,7 @@ static int bus_setup_api(Manager *m, sd_bus *bus) { r = sd_bus_add_match( bus, + NULL, "type='signal'," "sender='org.freedesktop.DBus'," "path='/org/freedesktop/DBus'," @@ -791,6 +794,7 @@ static int bus_setup_api(Manager *m, sd_bus *bus) { r = sd_bus_add_match( bus, + NULL, "type='signal'," "sender='org.freedesktop.DBus'," "path='/org/freedesktop/DBus'," @@ -874,6 +878,7 @@ static int bus_setup_system(Manager *m, sd_bus *bus) { * the system bus */ r = sd_bus_add_match( bus, + NULL, "type='signal'," "interface='org.freedesktop.systemd1.Agent'," "member='Released'," @@ -918,7 +923,7 @@ static int bus_init_system(Manager *m) { r = bus_setup_system(m, bus); if (r < 0) { - log_error("Fauiled to set up system bus: %s", strerror(-r)); + log_error("Failed to set up system bus: %s", strerror(-r)); return 0; } @@ -953,7 +958,7 @@ static int bus_init_private(Manager *m) { return 0; strcpy(sa.un.sun_path, "/run/systemd/private"); - salen = offsetof(union sockaddr_union, un.sun_path) + sizeof("/run/systemd/private") - 1; + salen = offsetof(union sockaddr_union, un.sun_path) + strlen("/run/systemd/private"); } else { size_t left = sizeof(sa.un.sun_path); char *p = sa.un.sun_path; @@ -1086,10 +1091,7 @@ void bus_done(Manager *m) { if (m->private_listen_event_source) m->private_listen_event_source = sd_event_source_unref(m->private_listen_event_source); - if (m->private_listen_fd >= 0) { - close_nointr_nofail(m->private_listen_fd); - m->private_listen_fd = -1; - } + m->private_listen_fd = safe_close(m->private_listen_fd); } int bus_fdset_add_all(Manager *m, FDSet *fds) { @@ -1163,7 +1165,6 @@ int bus_foreach_bus( void bus_track_serialize(sd_bus_track *t, FILE *f) { const char *n; - assert(t); assert(f); for (n = sd_bus_track_first(t); n; n = sd_bus_track_next(t))