X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Flogind-user.c;h=6ba8d9807bc16374284cd137bd3079251127d74e;hp=316c4cd0956c290da578f1afaef39b3830f95dbc;hb=3a9f7a30ce89b44097731310221802f6d72ea752;hpb=fb6becb4436ae4078337011b2017ce294e7361cf diff --git a/src/login/logind-user.c b/src/login/logind-user.c index 316c4cd09..6ba8d9807 100644 --- a/src/login/logind-user.c +++ b/src/login/logind-user.c @@ -25,13 +25,13 @@ #include "util.h" #include "mkdir.h" -#include "cgroup-util.h" #include "hashmap.h" #include "strv.h" #include "fileio.h" #include "special.h" #include "unit-name.h" -#include "dbus-common.h" +#include "bus-util.h" +#include "bus-error.h" #include "logind-user.h" User* user_new(Manager *m, uid_t uid, gid_t gid, const char *name) { @@ -72,7 +72,7 @@ void user_free(User *u) { assert(u); if (u->in_gc_queue) - LIST_REMOVE(User, gc_queue, u->manager->user_gc_queue, u); + LIST_REMOVE(gc_queue, u->manager->user_gc_queue, u); while (u->sessions) session_free(u->sessions); @@ -329,69 +329,67 @@ static int user_mkdir_runtime_path(User *u) { } static int user_start_slice(User *u) { - DBusError error; char *job; int r; assert(u); - dbus_error_init(&error); - if (!u->slice) { - char lu[DECIMAL_STR_MAX(unsigned long) + 1]; + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; + char lu[DECIMAL_STR_MAX(unsigned long) + 1], *slice; sprintf(lu, "%lu", (unsigned long) u->uid); - r = build_subslice(SPECIAL_USER_SLICE, lu, &u->slice); + r = build_subslice(SPECIAL_USER_SLICE, lu, &slice); if (r < 0) return r; - r = hashmap_put(u->manager->user_units, u->slice, u); - if (r < 0) - log_warning("Failed to create mapping between unit and user"); - } + r = manager_start_unit(u->manager, slice, &error, &job); + if (r < 0) { + log_error("Failed to start user slice: %s", bus_error_message(&error, r)); + free(slice); + } else { + u->slice = slice; - r = manager_start_unit(u->manager, u->slice, &error, &job); - if (r < 0) { - log_error("Failed to start user slice: %s", bus_error(&error, r)); - dbus_error_free(&error); + free(u->slice_job); + u->slice_job = job; + } } - free(u->slice_job); - u->slice_job = job; + if (u->slice) + hashmap_put(u->manager->user_units, u->slice, u); return 0; } static int user_start_service(User *u) { - DBusError error; + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; char *job; int r; assert(u); - dbus_error_init(&error); - if (!u->service) { - char lu[DECIMAL_STR_MAX(unsigned long) + 1]; + char lu[DECIMAL_STR_MAX(unsigned long) + 1], *service; sprintf(lu, "%lu", (unsigned long) u->uid); - u->service = unit_name_build("user", lu, ".service"); - if (!u->service) + service = unit_name_build("user", lu, ".service"); + if (!service) return log_oom(); - r = hashmap_put(u->manager->user_units, u->service, u); - if (r < 0) - log_warning("Failed to create mapping between service and user"); - } + r = manager_start_unit(u->manager, service, &error, &job); + if (r < 0) { + log_error("Failed to start user service: %s", bus_error_message(&error, r)); + free(service); + } else { + u->service = service; - r = manager_start_unit(u->manager, u->service, &error, &job); - if (r < 0) { - log_error("Failed to start user service: %s", bus_error(&error, r)); - dbus_error_free(&error); + free(u->service_job); + u->service_job = job; + } } - free(u->service_job); - u->service_job = job; + if (u->service) + hashmap_put(u->manager->user_units, u->service, u); return 0; } @@ -435,21 +433,18 @@ int user_start(User *u) { } static int user_stop_slice(User *u) { - DBusError error; + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; char *job; int r; assert(u); - dbus_error_init(&error); - if (!u->slice) return 0; r = manager_stop_unit(u->manager, u->slice, &error, &job); if (r < 0) { - log_error("Failed to stop user slice: %s", bus_error(&error, r)); - dbus_error_free(&error); + log_error("Failed to stop user slice: %s", bus_error_message(&error, r)); return r; } @@ -460,21 +455,18 @@ static int user_stop_slice(User *u) { } static int user_stop_service(User *u) { - DBusError error; + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; char *job; int r; assert(u); - dbus_error_init(&error); - if (!u->service) return 0; r = manager_stop_unit(u->manager, u->service, &error, &job); if (r < 0) { - log_error("Failed to stop user service: %s", bus_error(&error, r)); - dbus_error_free(&error); + log_error("Failed to stop user service: %s", bus_error_message(&error, r)); return r; } @@ -484,21 +476,6 @@ static int user_stop_service(User *u) { return r; } -/* static int user_shall_kill(User *u) { */ -/* assert(u); */ - -/* if (!u->manager->kill_user_processes) */ -/* return false; */ - -/* if (strv_contains(u->manager->kill_exclude_users, u->name)) */ -/* return false; */ - -/* if (strv_isempty(u->manager->kill_only_users)) */ -/* return true; */ - -/* return strv_contains(u->manager->kill_only_users, u->name); */ -/* } */ - static int user_remove_runtime_path(User *u) { int r; @@ -522,9 +499,6 @@ int user_stop(User *u) { int r = 0, k; assert(u); - if (u->started) - log_debug("User %s logged out.", u->name); - LIST_FOREACH(sessions_by_user, s, u->sessions) { k = session_stop(s); if (k < 0) @@ -541,6 +515,26 @@ int user_stop(User *u) { if (k < 0) r = k; + user_save(u); + + return r; +} + +int user_finalize(User *u) { + Session *s; + int r = 0, k; + + assert(u); + + if (u->started) + log_debug("User %s logged out.", u->name); + + LIST_FOREACH(sessions_by_user, s, u->sessions) { + k = session_finalize(s); + if (k < 0) + r = k; + } + /* Kill XDG_RUNTIME_DIR */ k = user_remove_runtime_path(u); if (k < 0) @@ -549,10 +543,10 @@ int user_stop(User *u) { unlink(u->state_file); user_add_to_gc_queue(u); - if (u->started) + if (u->started) { user_send_signal(u, false); - - u->started = false; + u->started = false; + } return r; } @@ -593,32 +587,44 @@ int user_get_idle_hint(User *u, dual_timestamp *t) { return idle_hint; } -static int user_check_linger_file(User *u) { - char *p; - int r; +int user_check_linger_file(User *u) { + _cleanup_free_ char *cc = NULL; + char *p = NULL; - if (asprintf(&p, "/var/lib/systemd/linger/%s", u->name) < 0) + cc = cescape(u->name); + if (!cc) return -ENOMEM; - r = access(p, F_OK) >= 0; - free(p); + p = strappenda("/var/lib/systemd/linger/", cc); - return r; + return access(p, F_OK) >= 0; } -int user_check_gc(User *u, bool drop_not_started) { +bool user_check_gc(User *u, bool drop_not_started) { assert(u); if (drop_not_started && !u->started) - return 0; + return false; if (u->sessions) - return 1; + return true; if (user_check_linger_file(u) > 0) - return 1; + return true; - return 0; + if (u->slice_job && manager_job_is_active(u->manager, u->slice_job)) + return true; + + if (u->service_job && manager_job_is_active(u->manager, u->service_job)) + return true; + + if (u->slice && manager_unit_is_active(u->manager, u->slice) != 0) + return true; + + if (u->service && manager_unit_is_active(u->manager, u->service) != 0) + return true; + + return false; } void user_add_to_gc_queue(User *u) { @@ -627,7 +633,7 @@ void user_add_to_gc_queue(User *u) { if (u->in_gc_queue) return; - LIST_PREPEND(User, gc_queue, u->manager->user_gc_queue, u); + LIST_PREPEND(gc_queue, u->manager->user_gc_queue, u); u->in_gc_queue = true; } @@ -637,8 +643,11 @@ UserState user_get_state(User *u) { assert(u); + if (u->closing) + return USER_CLOSING; + if (u->slice_job || u->service_job) - return u->started ? USER_OPENING : USER_CLOSING; + return USER_OPENING; LIST_FOREACH(sessions_by_user, i, u->sessions) { if (session_is_active(i))