diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-04-07 21:08:07 +0200 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2017-03-14 07:52:37 +0100 |
| commit | 40547399945b02a1537c83437f5e76c65568fa3c (patch) | |
| tree | a78c08803df2b84fbd74a688b4865acae79a3689 | |
| parent | cdd95216d7b3eb57c5b563657a63a01dbae01805 (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.
| -rw-r--r-- | src/login/logind-dbus.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index 8bdb2457d..8c1748b15 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -1866,21 +1866,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); @@ -2110,7 +2109,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), |