chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fsckd: the error code is actually returned in 'fd'
[elogind.git]
/
src
/
login
/
loginctl.c
diff --git
a/src/login/loginctl.c
b/src/login/loginctl.c
index b0eede9a34fa59c6a10363400baaf04e54241b75..ec102ae4c7c7e62e0d9ab2f82ceecf2d2250ef08 100644
(file)
--- a/
src/login/loginctl.c
+++ b/
src/login/loginctl.c
@@
-23,7
+23,6
@@
#include <errno.h>
#include <string.h>
#include <getopt.h>
#include <errno.h>
#include <string.h>
#include <getopt.h>
-#include <pwd.h>
#include <locale.h>
#include "sd-bus.h"
#include <locale.h>
#include "sd-bus.h"
@@
-869,7
+868,7
@@
static int activate(int argc, char *argv[], void *userdata) {
for (i = 1; i < argc; i++) {
for (i = 1; i < argc; i++) {
- r = sd_bus_call_method
(
+ r = sd_bus_call_method(
bus,
"org.freedesktop.login1",
"/org/freedesktop/login1",
bus,
"org.freedesktop.login1",
"/org/freedesktop/login1",
@@
-904,7
+903,7
@@
static int kill_session(int argc, char *argv[], void *userdata) {
for (i = 1; i < argc; i++) {
for (i = 1; i < argc; i++) {
- r = sd_bus_call_method
(
+ r = sd_bus_call_method(
bus,
"org.freedesktop.login1",
"/org/freedesktop/login1",
bus,
"org.freedesktop.login1",
"/org/freedesktop/login1",
@@
-954,7
+953,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]);
}
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",
bus,
"org.freedesktop.login1",
"/org/freedesktop/login1",
@@
-988,7
+987,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]);
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",
bus,
"org.freedesktop.login1",
"/org/freedesktop/login1",
@@
-1025,7
+1024,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]);
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",
bus,
"org.freedesktop.login1",
"/org/freedesktop/login1",
@@
-1054,7
+1053,7
@@
static int attach(int argc, char *argv[], void *userdata) {
for (i = 2; i < argc; i++) {
for (i = 2; i < argc; i++) {
- r = sd_bus_call_method
(
+ r = sd_bus_call_method(
bus,
"org.freedesktop.login1",
"/org/freedesktop/login1",
bus,
"org.freedesktop.login1",
"/org/freedesktop/login1",
@@
-1082,7
+1081,7
@@
static int flush_devices(int argc, char *argv[], void *userdata) {
polkit_agent_open_if_enabled();
polkit_agent_open_if_enabled();
- r = sd_bus_call_method
(
+ r = sd_bus_call_method(
bus,
"org.freedesktop.login1",
"/org/freedesktop/login1",
bus,
"org.freedesktop.login1",
"/org/freedesktop/login1",
@@
-1375,6
+1374,8
@@
int main(int argc, char *argv[]) {
goto finish;
}
goto finish;
}
+ sd_bus_set_allow_interactive_authorization(bus, arg_ask_password);
+
r = loginctl_main(argc, argv, bus);
finish:
r = loginctl_main(argc, argv, bus);
finish: