X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fdbus-unit.c;h=8e35377dc56370103424ac96cf05e10cbd52af06;hb=b1a954eace84207225e09f318728e90eae03fe97;hp=e3e1be12ade2be09393e0198ca85ac57eda43096;hpb=e99e38bbdcca3fe5956823bdb3d38544ccf93221;p=elogind.git diff --git a/src/dbus-unit.c b/src/dbus-unit.c index e3e1be12a..8e35377dc 100644 --- a/src/dbus-unit.c +++ b/src/dbus-unit.c @@ -25,6 +25,8 @@ #include "log.h" #include "dbus-unit.h" +const char bus_unit_interface[] = BUS_UNIT_INTERFACE; + int bus_unit_append_names(Manager *m, DBusMessageIter *i, const char *property, void *data) { char *t; Iterator j; @@ -258,6 +260,7 @@ static DBusHandlerResult bus_unit_message_dispatch(Unit *u, DBusMessage *message Manager *m = u->meta.manager; DBusError error; JobType job_type = _JOB_TYPE_INVALID; + char *path = NULL; dbus_error_init(&error); @@ -279,7 +282,9 @@ static DBusHandlerResult bus_unit_message_dispatch(Unit *u, DBusMessage *message JobMode mode; Job *j; int r; - char *path; + + if (job_type == JOB_START && u->meta.only_by_dependency) + return bus_send_error_reply(m, message, NULL, -EPERM); if (!dbus_message_get_args( message, @@ -307,6 +312,8 @@ static DBusHandlerResult bus_unit_message_dispatch(Unit *u, DBusMessage *message goto oom; } + free(path); + if (reply) { if (!dbus_connection_send(m->api_bus, reply, NULL)) goto oom; @@ -317,6 +324,8 @@ static DBusHandlerResult bus_unit_message_dispatch(Unit *u, DBusMessage *message return DBUS_HANDLER_RESULT_HANDLED; oom: + free(path); + if (reply) dbus_message_unref(reply); @@ -418,9 +427,12 @@ void bus_unit_send_removed_signal(Unit *u) { assert(u); - if (set_isempty(u->meta.manager->subscribed) || !u->meta.sent_dbus_new_signal) + if (set_isempty(u->meta.manager->subscribed)) return; + if (!u->meta.sent_dbus_new_signal) + bus_unit_send_change_signal(u); + if (!(p = unit_dbus_path(u))) goto oom;