core: no need to pass bus object to selinux access check calls anymore

[elogind.git] / src / core / dbus.c

diff --git a/src/core/dbus.c b/src/core/dbus.c
index be8dfc90f859eed8d488816473310b22081f0942..189d925c9ecdb037ce841f534fe07e761a383415 100644 (file)
--- 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;
 
@@ -918,7 +918,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 +953,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 +1086,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 +1160,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))