diff options
| author | Sven Eden <yamakuzure@gmx.net> | 2017-03-29 10:06:29 +0200 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2017-03-29 10:48:15 +0200 |
| commit | c73bfb05cb09992935ede3247a1cc4726e54a44d (patch) | |
| tree | 0320e470aae9bea445f52851ae027df70246ec04 /src/login/loginctl.c | |
| parent | fdff7397c22a853e7e66ec72adb85c3f2f519f32 (diff) | |
[4/5] Apply missing fixes from upstream
Diffstat (limited to 'src/login/loginctl.c')
| -rw-r--r-- | src/login/loginctl.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/login/loginctl.c b/src/login/loginctl.c index ac141dca7..6400dd6b0 100644 --- a/src/login/loginctl.c +++ b/src/login/loginctl.c @@ -746,7 +746,7 @@ static int print_property(const char *name, sd_bus_message *m, const char *conte if (r < 0) return bus_log_parse_error(r); - if (UID_IS_INVALID(uid)) { + if (!uid_is_valid(uid)) { log_error("Invalid user ID: " UID_FMT, uid); return -EINVAL; } @@ -1703,9 +1703,7 @@ static int parse_argv(int argc, char *argv[]) { return 0; case ARG_VERSION: - puts(PACKAGE_STRING); - puts(SYSTEMD_FEATURES); - return 0; + return version(); case 'p': { r = strv_extend(&arg_property, optarg); @@ -1846,7 +1844,7 @@ int main(int argc, char *argv[]) { if (r <= 0) goto finish; - r = bus_open_transport(arg_transport, arg_host, false, &bus); + r = bus_connect_transport(arg_transport, arg_host, false, &bus); if (r < 0) { log_error_errno(r, "Failed to create bus connection: %m"); goto finish; |