From c73bfb05cb09992935ede3247a1cc4726e54a44d Mon Sep 17 00:00:00 2001 From: Sven Eden Date: Wed, 29 Mar 2017 10:06:29 +0200 Subject: [4/5] Apply missing fixes from upstream --- src/login/inhibit.c | 4 +--- src/login/loginctl.c | 8 +++----- src/login/logind-action.c | 1 - src/login/logind-button.c | 6 ++---- src/login/logind-dbus.c | 2 +- src/login/logind-session.c | 23 ++++++++++++++--------- src/login/logind-user.c | 14 +++++++------- src/login/logind.c | 2 +- src/login/pam_elogind.c | 2 +- src/login/sysfs-show.c | 2 +- 10 files changed, 31 insertions(+), 33 deletions(-) diff --git a/src/login/inhibit.c b/src/login/inhibit.c index 89e529d01..bfee1ca06 100644 --- a/src/login/inhibit.c +++ b/src/login/inhibit.c @@ -179,9 +179,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 ARG_WHAT: arg_what = optarg; 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; diff --git a/src/login/logind-action.c b/src/login/logind-action.c index 5406cd45b..9b2ec6e24 100644 --- a/src/login/logind-action.c +++ b/src/login/logind-action.c @@ -154,7 +154,6 @@ int manager_handle_action( offending->uid, strna(u), offending->pid, strna(comm)); - warn_melody(); return -EPERM; } diff --git a/src/login/logind-button.c b/src/login/logind-button.c index 92c1b6795..f40e35a8c 100644 --- a/src/login/logind-button.c +++ b/src/login/logind-button.c @@ -66,12 +66,11 @@ void button_free(Button *b) { sd_event_source_unref(b->io_event_source); sd_event_source_unref(b->check_event_source); - if (b->fd >= 0) { + if (b->fd >= 0) /* If the device has been unplugged close() returns * ENODEV, let's ignore this, hence we don't use * safe_close() */ (void) close(b->fd); - } free(b->name); free(b->seat); @@ -248,8 +247,7 @@ int button_open(Button *b) { return log_warning_errno(errno, "Failed to open %s: %m", b->name); if (ioctl(b->fd, EVIOCGNAME(sizeof(name)), name) < 0) { - log_error_errno(errno, "Failed to get input name: %m"); - r = -errno; + r = log_error_errno(errno, "Failed to get input name: %m"); goto fail; } diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index e59795eed..d238d6c6f 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -1528,7 +1528,7 @@ int manager_dispatch_delayed(Manager *manager, bool timeout) { assert(manager); - if (manager->action_what == 0) + if (manager->action_what == 0 && manager->pending_action == 0) return 0; if (manager_is_inhibited(manager, manager->action_what, INHIBIT_DELAY, NULL, false, false, 0, &offending)) { diff --git a/src/login/logind-session.c b/src/login/logind-session.c index 016886805..ca1ea5868 100644 --- a/src/login/logind-session.c +++ b/src/login/logind-session.c @@ -530,7 +530,7 @@ static int session_start_scope(Session *s) { if (!scope) return log_oom(); - r = manager_start_scope(s->manager, scope, s->leader, s->user->slice, description, "logind.service", "systemd-user-sessions.service", &error, &job); + r = manager_start_scope(s->manager, scope, s->leader, s->user->slice, description, "systemd-logind.service", "systemd-user-sessions.service", &error, &job); if (r < 0) { log_error("Failed to start session scope %s: %s %s", scope, bus_error_message(&error, r), error.name); @@ -538,6 +538,7 @@ static int session_start_scope(Session *s) { return r; } else { s->scope = scope; + free(s->scope_job); s->scope_job = job; } @@ -1109,22 +1110,25 @@ int session_prepare_vt(Session *s) { r = fchown(vt, s->user->uid, -1); if (r < 0) { - r = -errno; - log_error_errno(errno, "Cannot change owner of /dev/tty%u: %m", s->vtnr); + r = log_error_errno(errno, + "Cannot change owner of /dev/tty%u: %m", + s->vtnr); goto error; } r = ioctl(vt, KDSKBMODE, K_OFF); if (r < 0) { - r = -errno; - log_error_errno(errno, "Cannot set K_OFF on /dev/tty%u: %m", s->vtnr); + r = log_error_errno(errno, + "Cannot set K_OFF on /dev/tty%u: %m", + s->vtnr); goto error; } r = ioctl(vt, KDSETMODE, KD_GRAPHICS); if (r < 0) { - r = -errno; - log_error_errno(errno, "Cannot set KD_GRAPHICS on /dev/tty%u: %m", s->vtnr); + r = log_error_errno(errno, + "Cannot set KD_GRAPHICS on /dev/tty%u: %m", + s->vtnr); goto error; } @@ -1136,8 +1140,9 @@ int session_prepare_vt(Session *s) { mode.acqsig = SIGRTMIN + 1; r = ioctl(vt, VT_SETMODE, &mode); if (r < 0) { - r = -errno; - log_error_errno(errno, "Cannot set VT_PROCESS on /dev/tty%u: %m", s->vtnr); + r = log_error_errno(errno, + "Cannot set VT_PROCESS on /dev/tty%u: %m", + s->vtnr); goto error; } diff --git a/src/login/logind-user.c b/src/login/logind-user.c index 63adc8210..0f7f31aa8 100644 --- a/src/login/logind-user.c +++ b/src/login/logind-user.c @@ -925,26 +925,26 @@ int config_parse_tmpfs_size( errno = 0; ul = strtoul(rvalue, &f, 10); if (errno != 0 || f != e) { - log_syntax(unit, LOG_ERR, filename, line, errno ? errno : EINVAL, "Failed to parse percentage value, ignoring: %s", rvalue); + log_syntax(unit, LOG_ERR, filename, line, errno, "Failed to parse percentage value, ignoring: %s", rvalue); return 0; } if (ul <= 0 || ul >= 100) { - log_syntax(unit, LOG_ERR, filename, line, errno ? errno : EINVAL, "Percentage value out of range, ignoring: %s", rvalue); + log_syntax(unit, LOG_ERR, filename, line, 0, "Percentage value out of range, ignoring: %s", rvalue); return 0; } *sz = PAGE_ALIGN((size_t) ((physical_memory() * (uint64_t) ul) / (uint64_t) 100)); } else { - off_t o; + uint64_t k; - r = parse_size(rvalue, 1024, &o); - if (r < 0 || (off_t) (size_t) o != o) { - log_syntax(unit, LOG_ERR, filename, line, r < 0 ? -r : ERANGE, "Failed to parse size value, ignoring: %s", rvalue); + r = parse_size(rvalue, 1024, &k); + if (r < 0 || (uint64_t) (size_t) k != k) { + log_syntax(unit, LOG_ERR, filename, line, r, "Failed to parse size value, ignoring: %s", rvalue); return 0; } - *sz = PAGE_ALIGN((size_t) o); + *sz = PAGE_ALIGN((size_t) k); } return 0; diff --git a/src/login/logind.c b/src/login/logind.c index 9e637c741..2e4342b0a 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -218,7 +218,7 @@ static void manager_free(Manager *m) { /* Avoid the creation of new processes forked by the * kernel; at this point, we will not listen to the * signals anyway */ - if (detect_container(NULL) <= 0) + if (detect_container() <= 0) (void) cg_uninstall_release_agent(SYSTEMD_CGROUP_CONTROLLER); manager_shutdown_cgroup(m, true); diff --git a/src/login/pam_elogind.c b/src/login/pam_elogind.c index 7ccaec56f..f66f1ce84 100644 --- a/src/login/pam_elogind.c +++ b/src/login/pam_elogind.c @@ -257,7 +257,7 @@ _public_ PAM_EXTERN int pam_sm_open_session( } /* Make sure we don't enter a loop by talking to - * logind when it is actually waiting for the + * systemd-logind when it is actually waiting for the * background to finish start-up. If the service is * "systemd-user" we simply set XDG_RUNTIME_DIR and * leave. */ diff --git a/src/login/sysfs-show.c b/src/login/sysfs-show.c index 9a9fb7622..f38f06baf 100644 --- a/src/login/sysfs-show.c +++ b/src/login/sysfs-show.c @@ -114,7 +114,7 @@ static int show_sysfs_one( "%s%s:%s%s%s%s", is_master ? "[MASTER] " : "", subsystem, sysname, - name ? " \"" : "", name ? name : "", name ? "\"" : "") < 0) + name ? " \"" : "", strempty(name), name ? "\"" : "") < 0) return -ENOMEM; free(k); -- cgit v1.2.3