summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/dbus-kill.c48
-rw-r--r--src/core/dbus-kill.h2
-rw-r--r--src/core/dbus-scope.c4
-rw-r--r--src/core/dbus-service.c4
4 files changed, 55 insertions, 3 deletions
diff --git a/src/core/dbus-kill.c b/src/core/dbus-kill.c
index e970ea329c..beae7da850 100644
--- a/src/core/dbus-kill.c
+++ b/src/core/dbus-kill.c
@@ -25,12 +25,56 @@
#include "dbus-kill.h"
#include "dbus-common.h"
-DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_kill_append_mode, kill_mode, KillMode);
+static DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_kill_append_mode, kill_mode, KillMode);
const BusProperty bus_kill_context_properties[] = {
{ "KillMode", bus_kill_append_mode, "s", offsetof(KillContext, kill_mode) },
{ "KillSignal", bus_property_append_int, "i", offsetof(KillContext, kill_signal) },
{ "SendSIGKILL", bus_property_append_bool, "b", offsetof(KillContext, send_sigkill) },
{ "SendSIGHUP", bus_property_append_bool, "b", offsetof(KillContext, send_sighup) },
- { NULL, }
+ {}
};
+
+int bus_kill_context_set_transient_property(
+ Unit *u,
+ KillContext *c,
+ const char *name,
+ DBusMessageIter *i,
+ UnitSetPropertiesMode mode,
+ DBusError *error) {
+
+ assert(u);
+ assert(c);
+ assert(name);
+ assert(i);
+
+ if (streq(name, "SendSIGHUP")) {
+
+ if (dbus_message_iter_get_arg_type(i) != DBUS_TYPE_BOOLEAN)
+ return -EINVAL;
+
+ if (mode != UNIT_CHECK) {
+ dbus_bool_t b;
+ dbus_message_iter_get_basic(i, &b);
+ c->send_sighup = b;
+ }
+
+ return 1;
+
+ } else if (streq(name, "SendSIGKILL")) {
+
+ if (dbus_message_iter_get_arg_type(i) != DBUS_TYPE_BOOLEAN)
+ return -EINVAL;
+
+ if (mode != UNIT_CHECK) {
+ dbus_bool_t b;
+ dbus_message_iter_get_basic(i, &b);
+ c->send_sigkill = b;
+ }
+
+ return 1;
+
+ }
+
+ return 0;
+}
diff --git a/src/core/dbus-kill.h b/src/core/dbus-kill.h
index 8c8bff5927..7676d98e91 100644
--- a/src/core/dbus-kill.h
+++ b/src/core/dbus-kill.h
@@ -34,4 +34,4 @@
extern const BusProperty bus_kill_context_properties[];
-int bus_kill_append_mode(DBusMessageIter *i, const char *property, void *data);
+int bus_kill_context_set_transient_property(Unit *u, KillContext *c, const char *name, DBusMessageIter *i, UnitSetPropertiesMode mode, DBusError *error);
diff --git a/src/core/dbus-scope.c b/src/core/dbus-scope.c
index 771820c2d8..497e4520d1 100644
--- a/src/core/dbus-scope.c
+++ b/src/core/dbus-scope.c
@@ -170,6 +170,10 @@ int bus_scope_set_property(
r = bus_scope_set_transient_property(s, name, i, mode, error);
if (r != 0)
return r;
+
+ r = bus_kill_context_set_transient_property(u, &s->kill_context, name, i, mode, error);
+ if (r != 0)
+ return r;
}
return 0;
diff --git a/src/core/dbus-service.c b/src/core/dbus-service.c
index 1a44e1fd1b..85b13f01ef 100644
--- a/src/core/dbus-service.c
+++ b/src/core/dbus-service.c
@@ -324,6 +324,10 @@ int bus_service_set_property(
r = bus_service_set_transient_property(s, name, i, mode, error);
if (r != 0)
return r;
+
+ r = bus_kill_context_set_transient_property(u, &s->kill_context, name, i, mode, error);
+ if (r != 0)
+ return r;
}
return 0;