diff options
author | Vesa Jääskeläinen <vesa.jaaskelainen@vaisala.com> | 2019-03-11 23:18:29 +0200 |
---|---|---|
committer | Vesa Jääskeläinen <vesa.jaaskelainen@vaisala.com> | 2019-03-22 17:38:54 +0200 |
commit | ce7f10707d069f87a25f79c17bb5fe593c4bb4c7 (patch) | |
tree | 6de743be1d90fe92aa5cf42ce61f84524240a6cf | |
parent | systemctl: restore "systemctl reboot ARG" functionality (diff) | |
download | systemd-ce7f10707d069f87a25f79c17bb5fe593c4bb4c7.tar.xz systemd-ce7f10707d069f87a25f79c17bb5fe593c4bb4c7.zip |
logind: relocate function return_test_polkit()
Relocate function return_test_polkit() upper in file for easier access from other functions.
-rw-r--r-- | src/login/logind-dbus.c | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index 003ab45461a..795fc3b645b 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -168,6 +168,32 @@ int manager_get_seat_from_creds(Manager *m, sd_bus_message *message, const char return 0; } +static int return_test_polkit( + sd_bus_message *message, + int capability, + const char *action, + const char **details, + uid_t good_user, + sd_bus_error *e) { + + const char *result; + bool challenge; + int r; + + r = bus_test_polkit(message, capability, action, details, good_user, &challenge, e); + if (r < 0) + return r; + + if (r > 0) + result = "yes"; + else if (challenge) + result = "challenge"; + else + result = "no"; + + return sd_bus_reply_method_return(message, "s", result); +} + static int property_get_idle_hint( sd_bus *bus, const char *path, @@ -2488,32 +2514,6 @@ static int method_set_reboot_to_firmware_setup( return sd_bus_reply_method_return(message, NULL); } -static int return_test_polkit( - sd_bus_message *message, - int capability, - const char *action, - const char **details, - uid_t good_user, - sd_bus_error *e) { - - const char *result; - bool challenge; - int r; - - r = bus_test_polkit(message, capability, action, details, good_user, &challenge, e); - if (r < 0) - return r; - - if (r > 0) - result = "yes"; - else if (challenge) - result = "challenge"; - else - result = "no"; - - return sd_bus_reply_method_return(message, "s", result); -} - static int method_can_reboot_to_firmware_setup( sd_bus_message *message, void *userdata, |