X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fdbus-job.c;h=6489348fb26d1dba56c5d8d2050e165b84f1cae4;hb=43a99a7afe3063eebc901452026b13360b69a7b5;hp=e774383793b932bcddbce857867bb44d9263adba;hpb=718db96199eb307751264e4163555662c9a389fa;p=elogind.git

diff --git a/src/core/dbus-job.c b/src/core/dbus-job.c
index e77438379..6489348fb 100644
--- a/src/core/dbus-job.c
+++ b/src/core/dbus-job.c
@@ -35,8 +35,8 @@ static int property_get_unit(
                 const char *interface,
                 const char *property,
                 sd_bus_message *reply,
-                sd_bus_error *error,
-                void *userdata) {
+                void *userdata,
+                sd_bus_error *error) {
 
         _cleanup_free_ char *p = NULL;
         Job *j = userdata;
@@ -52,25 +52,29 @@ static int property_get_unit(
         return sd_bus_message_append(reply, "(so)", j->unit->id, p);
 }
 
-static int method_cancel(sd_bus *bus, sd_bus_message *message, void *userdata) {
+static int method_cancel(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) {
         Job *j = userdata;
+        int r;
 
         assert(bus);
         assert(message);
         assert(j);
 
-        SELINUX_UNIT_ACCESS_CHECK(j->unit, bus, message, "stop");
+        r = selinux_unit_access_check(j->unit, bus, message, "stop", error);
+        if (r < 0)
+                return r;
+
         job_finish_and_invalidate(j, JOB_CANCELED, true);
 
-        return sd_bus_reply_method_return(bus, message, NULL);
+        return sd_bus_reply_method_return(message, NULL);
 }
 
 const sd_bus_vtable bus_job_vtable[] = {
         SD_BUS_VTABLE_START(0),
         SD_BUS_METHOD("Cancel", NULL, NULL, method_cancel, 0),
-        SD_BUS_PROPERTY("Id", "u", NULL, offsetof(Job, id), 0),
-        SD_BUS_PROPERTY("Unit", "(so)", property_get_unit, 0, 0),
-        SD_BUS_PROPERTY("JobType", "s", property_get_type, offsetof(Job, type), 0),
+        SD_BUS_PROPERTY("Id", "u", NULL, offsetof(Job, id), SD_BUS_VTABLE_PROPERTY_CONST),
+        SD_BUS_PROPERTY("Unit", "(so)", property_get_unit, 0, SD_BUS_VTABLE_PROPERTY_CONST),
+        SD_BUS_PROPERTY("JobType", "s", property_get_type, offsetof(Job, type), SD_BUS_VTABLE_PROPERTY_CONST),
         SD_BUS_PROPERTY("State", "s", property_get_state, offsetof(Job, state), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
         SD_BUS_VTABLE_END
 };
@@ -80,7 +84,7 @@ static int foreach_client(Job *j, int (*send_message)(sd_bus *bus, const char *n
         Iterator i;
         sd_bus *b;
         unsigned n, m;
-        int r;
+        int r, ret;
 
         assert(j);
         assert(send_message);
@@ -101,17 +105,22 @@ static int foreach_client(Job *j, int (*send_message)(sd_bus *bus, const char *n
         if (one_destination)
                 return send_message(one_destination->bus, isempty(one_destination->name) ? NULL : one_destination->name, j);
 
+        ret = 0;
+
         /* Send to everybody */
         SET_FOREACH(b, j->manager->private_buses, i) {
                 r = send_message(b, NULL, j);
                 if (r < 0)
-                        return r;
+                        ret = r;
         }
 
-        if (j->manager->api_bus)
-                return send_message(j->manager->api_bus, NULL, j);
+        if (j->manager->api_bus) {
+                r = send_message(j->manager->api_bus, NULL, j);
+                if (r < 0)
+                        ret = r;
+        }
 
-        return 0;
+        return ret;
 }
 
 static int send_new_signal(sd_bus *bus, const char *destination, Job *j) {
@@ -167,7 +176,7 @@ void bus_job_send_change_signal(Job *j) {
 
         r = foreach_client(j, j->sent_dbus_new_signal ? send_changed_signal : send_new_signal);
         if (r < 0)
-                log_warning("Failed to send job change signal for %u/%s: %s", j->id, j->unit->id, strerror(-r));
+                log_debug("Failed to send job change signal for %u: %s", j->id, strerror(-r));
 
         j->sent_dbus_new_signal = true;
 }
@@ -211,6 +220,5 @@ void bus_job_send_removed_signal(Job *j) {
 
         r = foreach_client(j, send_removed_signal);
         if (r < 0)
-                log_warning("Failed to send job removal signal for %u/%s: %s", j->id, j->unit->id, strerror(-r));
-                return;
+                log_debug("Failed to send job remove signal for %u: %s", j->id, strerror(-r));
 }