X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fdbus-job.c;h=8b5ea2566d22dd6537005d88cf43d670670afba5;hb=76c37ab6d205c95e8f43ffbc19553b936330195a;hp=eb7257d681368bc2ae21c92b644919550309a351;hpb=283868e1dcd8ea7475850d9c6e7d4722c473dd50;p=elogind.git diff --git a/src/core/dbus-job.c b/src/core/dbus-job.c index eb7257d68..8b5ea2566 100644 --- a/src/core/dbus-job.c +++ b/src/core/dbus-job.c @@ -30,7 +30,6 @@ static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_type, job_type, JobType); static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_state, job_state, JobState); static int verify_sys_admin_or_owner_sync(sd_bus_message *message, Job *j, sd_bus_error *error) { - _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL; int r; if (sd_bus_track_contains(j->clients, sd_bus_message_get_sender(message))) @@ -81,7 +80,7 @@ int bus_job_method_cancel(sd_bus *bus, sd_bus_message *message, void *userdata, if (r < 0) return r; - r = selinux_unit_access_check(j->unit, message, "stop", error); + r = mac_selinux_unit_access_check(j->unit, message, "stop", error); if (r < 0) return r; @@ -155,7 +154,7 @@ void bus_job_send_change_signal(Job *j) { r = bus_foreach_bus(j->manager, j->clients, j->sent_dbus_new_signal ? send_changed_signal : send_new_signal, j); if (r < 0) - log_debug("Failed to send job change signal for %u: %s", j->id, strerror(-r)); + log_debug_errno(r, "Failed to send job change signal for %u: %m", j->id); j->sent_dbus_new_signal = true; } @@ -199,5 +198,5 @@ void bus_job_send_removed_signal(Job *j) { r = bus_foreach_bus(j->manager, j->clients, send_removed_signal, j); if (r < 0) - log_debug("Failed to send job remove signal for %u: %s", j->id, strerror(-r)); + log_debug_errno(r, "Failed to send job remove signal for %u: %m", j->id); }