hostnamectl: should the sanitized arch, not the native uname() one

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

diff --git a/src/core/dbus.c b/src/core/dbus.c
index ccbbc3474d4d716bd6394682bdbbe5f71c52ff6a..10594157114962ecadc05ef0825d350acad81f78 100644 (file)
--- a/src/core/dbus.c
+++ b/src/core/dbus.c
@@ -173,7 +173,7 @@ static int signal_activation_request(sd_bus *bus, sd_bus_message *message, void
                 goto failed;
 
         if (u->refuse_manual_start) {
-                r = sd_bus_error_setf(&error, BUS_ERROR_ONLY_BY_DEPENDENCY, "Operation refused, %u may be requested by dependency only.", u->id);
+                r = sd_bus_error_setf(&error, BUS_ERROR_ONLY_BY_DEPENDENCY, "Operation refused, %s may be requested by dependency only.", u->id);
                 goto failed;
         }
 
@@ -190,7 +190,7 @@ failed:
 
         log_debug("D-Bus activation failed for %s: %s", name, bus_error_message(&error, r));
 
-        r = sd_bus_message_new_signal(bus, "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Activator", "ActivationFailure", &reply);
+        r = sd_bus_message_new_signal(bus, &reply, "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Activator", "ActivationFailure");
         if (r < 0) {
                 bus_log_create_error(r);
                 return 0;
@@ -623,6 +623,7 @@ static int bus_setup_disconnected_match(Manager *m, sd_bus *bus) {
 
         r = sd_bus_add_match(
                         bus,
+                        "sender='org.freedesktop.DBus.Local',"
                         "type='signal',"
                         "path='/org/freedesktop/DBus/Local',"
                         "interface='org.freedesktop.DBus.Local',"
@@ -993,7 +994,7 @@ static int bus_init_private(Manager *m) {
                 return -errno;
         }
 
-        r = sd_event_add_io(m->event, fd, EPOLLIN, bus_on_connection, m, &s);
+        r = sd_event_add_io(m->event, &s, fd, EPOLLIN, bus_on_connection, m);
         if (r < 0) {
                 log_error("Failed to allocate event source: %s", strerror(-r));
                 return r;