diff options
| author | Lennart Poettering <lennart@poettering.net> | 2011-06-29 02:27:16 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-06-29 02:27:16 +0200 |
| commit | 25d934917d3dd2ab10e8acc9a6bacd8c7f2f1067 (patch) | |
| tree | fdcb8edf4cd8f3513fe0506814d140c5d5950613 /src/logind-dbus.c | |
| parent | ac2dcbb2155fa421b826cfd45ec98d4237b1c9fe (diff) | |
logind: move default reset controller/kill exclude list into logind
Diffstat (limited to 'src/logind-dbus.c')
| -rw-r--r-- | src/logind-dbus.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/logind-dbus.c b/src/logind-dbus.c index 69e6b189aa..93525980b7 100644 --- a/src/logind-dbus.c +++ b/src/logind-dbus.c @@ -316,7 +316,8 @@ static int bus_manager_create_session(Manager *m, DBusMessage *message, DBusMess if (r < 0) return -EINVAL; - if (!dbus_message_iter_next(&iter) || + if (strv_contains(controllers, "systemd") || + !dbus_message_iter_next(&iter) || dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_ARRAY || dbus_message_iter_get_element_type(&iter) != DBUS_TYPE_STRING) { r = -EINVAL; @@ -327,7 +328,8 @@ static int bus_manager_create_session(Manager *m, DBusMessage *message, DBusMess if (r < 0) goto fail; - if (!dbus_message_iter_next(&iter) || + if (strv_contains(reset_controllers, "systemd") || + !dbus_message_iter_next(&iter) || dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_BOOLEAN) { r = -EINVAL; goto fail; |