chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[4/5] Apply missing fixes from upstream
[elogind.git]
/
src
/
login
/
loginctl.c
diff --git
a/src/login/loginctl.c
b/src/login/loginctl.c
index ac141dca73126d8c219b5283666ea9aff1d4fe51..6400dd6b020fafb939cdb664f99bac000e933149 100644
(file)
--- 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 (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;
}
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:
return 0;
case ARG_VERSION:
- puts(PACKAGE_STRING);
- puts(SYSTEMD_FEATURES);
- return 0;
+ return version();
case 'p': {
r = strv_extend(&arg_property, optarg);
case 'p': {
r = strv_extend(&arg_property, optarg);
@@
-1846,7
+1844,7
@@
int main(int argc, char *argv[]) {
if (r <= 0)
goto finish;
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;
if (r < 0) {
log_error_errno(r, "Failed to create bus connection: %m");
goto finish;