X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fdbus-execute.c;h=bb660b1853a19d375e2e537c15954c92f9b6c796;hp=d37bd5560ed31361b5c5ff31f9e606ead0da73f7;hb=4502d22cb8a96d9059b02861b8074e4fadf2cab2;hpb=03fae01822b5275a2940458f65644796283a8a23 diff --git a/src/dbus-execute.c b/src/dbus-execute.c index d37bd5560..bb660b185 100644 --- a/src/dbus-execute.c +++ b/src/dbus-execute.c @@ -28,6 +28,8 @@ #include "ioprio.h" #include "strv.h" +DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_execute_append_kill_mode, kill_mode, KillMode); + DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_execute_append_input, exec_input, ExecInput); DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_execute_append_output, exec_output, ExecOutput); @@ -256,7 +258,7 @@ int bus_execute_append_command(Manager *m, DBusMessageIter *i, const char *prope assert(i); assert(property); - if (!dbus_message_iter_open_container(i, DBUS_TYPE_ARRAY, "(sasttuii)", &sub)) + if (!dbus_message_iter_open_container(i, DBUS_TYPE_ARRAY, "(sasbttuii)", &sub)) return -ENOMEM; LIST_FOREACH(command, c, c) { @@ -281,6 +283,7 @@ int bus_execute_append_command(Manager *m, DBusMessageIter *i, const char *prope status = (int32_t) c->exec_status.status; if (!dbus_message_iter_close_container(&sub2, &sub3) || + !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_BOOLEAN, &c->ignore) || !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_UINT64, &c->exec_status.start_timestamp.realtime) || !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_UINT64, &c->exec_status.exit_timestamp.realtime) || !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_UINT32, &c->exec_status.pid) ||