summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-04-07 21:08:07 +0200
committerLennart Poettering <lennart@poettering.net>2015-04-07 21:09:18 +0200
commit889f25b2ccea77770e62220ecf65a6799794bfa2 (patch)
tree9d97c78971df6705febe77ed766621fff01a6094 /src
parent66fa453fa176d2379d321afb1d20c549bbcb2715 (diff)
logind: drop "interactive" parameter from SetRebootToFirmwareSetup() bus call
Newer dbus versions have an "allow interactive authentication" bit in the message header, hence it is not necessary to take a boolean for this explicitly.
Diffstat (limited to 'src')
-rw-r--r--src/login/logind-dbus.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 46185f40a3..9ba85d80a1 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -1879,21 +1879,20 @@ static int method_set_reboot_to_firmware_setup(
sd_bus_error *error) {
int b, r;
- int interactive;
Manager *m = userdata;
assert(bus);
assert(message);
assert(m);
- r = sd_bus_message_read(message, "bb", &b, &interactive);
+ r = sd_bus_message_read(message, "b", &b);
if (r < 0)
return r;
r = bus_verify_polkit_async(message,
CAP_SYS_ADMIN,
"org.freedesktop.login1.set-reboot-to-firmware-setup",
- interactive,
+ false,
UID_INVALID,
&m->polkit_registry,
error);
@@ -2124,7 +2123,7 @@ const sd_bus_vtable manager_vtable[] = {
SD_BUS_METHOD("CanHybridSleep", NULL, "s", method_can_hybrid_sleep, SD_BUS_VTABLE_UNPRIVILEGED),
SD_BUS_METHOD("Inhibit", "ssss", "h", method_inhibit, SD_BUS_VTABLE_UNPRIVILEGED),
SD_BUS_METHOD("CanRebootToFirmwareSetup", NULL, "s", method_can_reboot_to_firmware_setup, SD_BUS_VTABLE_UNPRIVILEGED),
- SD_BUS_METHOD("SetRebootToFirmwareSetup", "bb", NULL, method_set_reboot_to_firmware_setup, SD_BUS_VTABLE_UNPRIVILEGED),
+ SD_BUS_METHOD("SetRebootToFirmwareSetup", "b", NULL, method_set_reboot_to_firmware_setup, SD_BUS_VTABLE_UNPRIVILEGED),
SD_BUS_SIGNAL("SessionNew", "so", 0),
SD_BUS_SIGNAL("SessionRemoved", "so", 0),