chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
security: rework selinux, smack, ima, apparmor detection logic
[elogind.git]
/
src
/
core
/
dbus-scope.c
diff --git
a/src/core/dbus-scope.c
b/src/core/dbus-scope.c
index 0205cfff6e0c6ee178a59052f50989a542eedcaf..783a969fb3438e5c09b8350877db68f78746d0bd 100644
(file)
--- a/
src/core/dbus-scope.c
+++ b/
src/core/dbus-scope.c
@@
-93,7
+93,7
@@
static int bus_scope_set_transient_property(
if (streq(name, "PIDs")) {
DBusMessageIter sub;
if (streq(name, "PIDs")) {
DBusMessageIter sub;
- unsigned n;
+ unsigned n
= 0
;
if (dbus_message_iter_get_arg_type(i) != DBUS_TYPE_ARRAY ||
dbus_message_iter_get_element_type(i) != DBUS_TYPE_UINT32)
if (dbus_message_iter_get_arg_type(i) != DBUS_TYPE_ARRAY ||
dbus_message_iter_get_element_type(i) != DBUS_TYPE_UINT32)
@@
-138,6
+138,8
@@
static int bus_scope_set_transient_property(
dbus_message_iter_get_basic(i, &t);
s->timeout_stop_usec = t;
dbus_message_iter_get_basic(i, &t);
s->timeout_stop_usec = t;
+
+ unit_write_drop_in_format(UNIT(s), mode, name, "[Scope]\nTimeoutStopSec=%lluus\n", (unsigned long long) t);
}
return 1;
}
return 1;
@@
-170,6
+172,10
@@
int bus_scope_set_property(
r = bus_scope_set_transient_property(s, name, i, mode, error);
if (r != 0)
return r;
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;
}
return 0;