diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2015-05-25 11:04:44 +0200 |
|---|---|---|
| committer | Martin Pitt <martin.pitt@ubuntu.com> | 2015-05-25 11:04:44 +0200 |
| commit | e3bff60a6ef3419af32552b54bf19331e59c01c9 (patch) | |
| tree | 14a42a8e0877e998b27b140fb47e3bac35b6c0ba /src/login/loginctl.c | |
| parent | e735f4d4eafc8c8c296cefc8228cf91c3fcfe822 (diff) | |
| download | systemd-e3bff60a6ef3419af32552b54bf19331e59c01c9.tar.gz | |
Imported Upstream version 220
Diffstat (limited to 'src/login/loginctl.c')
| -rw-r--r-- | src/login/loginctl.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/login/loginctl.c b/src/login/loginctl.c index b0eede9a34..4a5a618472 100644 --- a/src/login/loginctl.c +++ b/src/login/loginctl.c @@ -23,7 +23,6 @@ #include <errno.h> #include <string.h> #include <getopt.h> -#include <pwd.h> #include <locale.h> #include "sd-bus.h" @@ -42,6 +41,8 @@ #include "cgroup-util.h" #include "spawn-polkit-agent.h" #include "verbs.h" +#include "process-util.h" +#include "terminal-util.h" static char **arg_property = NULL; static bool arg_all = false; @@ -869,7 +870,7 @@ static int activate(int argc, char *argv[], void *userdata) { for (i = 1; i < argc; i++) { - r = sd_bus_call_method ( + r = sd_bus_call_method( bus, "org.freedesktop.login1", "/org/freedesktop/login1", @@ -904,7 +905,7 @@ static int kill_session(int argc, char *argv[], void *userdata) { for (i = 1; i < argc; i++) { - r = sd_bus_call_method ( + r = sd_bus_call_method( bus, "org.freedesktop.login1", "/org/freedesktop/login1", @@ -954,7 +955,7 @@ static int enable_linger(int argc, char *argv[], void *userdata) { return log_error_errno(r, "Failed to look up user %s: %m", argv[i]); } - r = sd_bus_call_method ( + r = sd_bus_call_method( bus, "org.freedesktop.login1", "/org/freedesktop/login1", @@ -988,7 +989,7 @@ static int terminate_user(int argc, char *argv[], void *userdata) { if (r < 0) return log_error_errno(r, "Failed to look up user %s: %m", argv[i]); - r = sd_bus_call_method ( + r = sd_bus_call_method( bus, "org.freedesktop.login1", "/org/freedesktop/login1", @@ -1025,7 +1026,7 @@ static int kill_user(int argc, char *argv[], void *userdata) { if (r < 0) return log_error_errno(r, "Failed to look up user %s: %m", argv[i]); - r = sd_bus_call_method ( + r = sd_bus_call_method( bus, "org.freedesktop.login1", "/org/freedesktop/login1", @@ -1054,7 +1055,7 @@ static int attach(int argc, char *argv[], void *userdata) { for (i = 2; i < argc; i++) { - r = sd_bus_call_method ( + r = sd_bus_call_method( bus, "org.freedesktop.login1", "/org/freedesktop/login1", @@ -1082,7 +1083,7 @@ static int flush_devices(int argc, char *argv[], void *userdata) { polkit_agent_open_if_enabled(); - r = sd_bus_call_method ( + r = sd_bus_call_method( bus, "org.freedesktop.login1", "/org/freedesktop/login1", @@ -1375,6 +1376,8 @@ int main(int argc, char *argv[]) { goto finish; } + sd_bus_set_allow_interactive_authorization(bus, arg_ask_password); + r = loginctl_main(argc, argv, bus); finish: |