X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind-user.c;h=49c373b50dad738c8f5ce5829d06c2c73d90ff80;hb=8cb4ab0058e51f1fba93683d145ef95f97c2fa86;hp=9bbe879571e4c838214478e77e64e24dcdf9f0f3;hpb=1c231f56482546725c4dbd3303f70300bd3c63e9;p=elogind.git diff --git a/src/login/logind-user.c b/src/login/logind-user.c index 9bbe87957..49c373b50 100644 --- a/src/login/logind-user.c +++ b/src/login/logind-user.c @@ -35,7 +35,9 @@ #include "bus-util.h" #include "bus-error.h" #include "conf-parser.h" +#include "clean-ipc.h" #include "logind-user.h" +#include "smack-util.h" User* user_new(Manager *m, uid_t uid, gid_t gid, const char *name) { User *u; @@ -51,10 +53,10 @@ User* user_new(Manager *m, uid_t uid, gid_t gid, const char *name) { if (!u->name) goto fail; - if (asprintf(&u->state_file, "/run/systemd/users/%lu", (unsigned long) uid) < 0) + if (asprintf(&u->state_file, "/run/systemd/users/"UID_FMT, uid) < 0) goto fail; - if (hashmap_put(m->users, ULONG_TO_PTR((unsigned long) uid), u) < 0) + if (hashmap_put(m->users, UID_TO_PTR(uid), u) < 0) goto fail; u->manager = m; @@ -95,7 +97,7 @@ void user_free(User *u) { free(u->runtime_path); - hashmap_remove(u->manager->users, ULONG_TO_PTR((unsigned long) u->uid)); + hashmap_remove(u->manager->users, UID_TO_PTR(u->uid)); free(u->name); free(u->state_file); @@ -250,7 +252,7 @@ int user_save(User *u) { finish: if (r < 0) - log_error("Failed to save user data %s: %s", u->state_file, strerror(-r)); + log_error_errno(r, "Failed to save user data %s: %m", u->state_file); return r; } @@ -276,7 +278,7 @@ int user_load(User *u) { if (r == -ENOENT) return 0; - log_error("Failed to read %s: %s", u->state_file, strerror(-r)); + log_error_errno(r, "Failed to read %s: %m", u->state_file); return r; } @@ -308,10 +310,8 @@ static int user_mkdir_runtime_path(User *u) { assert(u); r = mkdir_safe_label("/run/user", 0755, 0, 0); - if (r < 0) { - log_error("Failed to create /run/user: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to create /run/user: %m"); if (!u->runtime_path) { if (asprintf(&p, "/run/user/" UID_FMT, u->uid) < 0) @@ -324,14 +324,19 @@ static int user_mkdir_runtime_path(User *u) { mkdir(p, 0700); - if (asprintf(&t, "mode=0700,uid=" UID_FMT ",gid=" GID_FMT ",size=%zu", u->uid, u->gid, u->manager->runtime_dir_size) < 0) { + if (mac_smack_use()) + r = asprintf(&t, "mode=0700,smackfsroot=*,uid=" UID_FMT ",gid=" GID_FMT ",size=%zu", u->uid, u->gid, u->manager->runtime_dir_size); + else + r = asprintf(&t, "mode=0700,uid=" UID_FMT ",gid=" GID_FMT ",size=%zu", u->uid, u->gid, u->manager->runtime_dir_size); + + if (r < 0) { r = log_oom(); goto fail; } r = mount("tmpfs", p, "tmpfs", MS_NODEV|MS_NOSUID, t); if (r < 0) { - log_error("Failed to mount per-user tmpfs directory %s: %s", p, strerror(-r)); + log_error_errno(r, "Failed to mount per-user tmpfs directory %s: %m", p); goto fail; } } @@ -353,8 +358,8 @@ static int user_start_slice(User *u) { if (!u->slice) { _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); + char lu[DECIMAL_STR_MAX(uid_t) + 1], *slice; + sprintf(lu, UID_FMT, u->uid); r = build_subslice(SPECIAL_USER_SLICE, lu, &slice); if (r < 0) @@ -386,8 +391,8 @@ static int user_start_service(User *u) { assert(u); if (!u->service) { - char lu[DECIMAL_STR_MAX(unsigned long) + 1], *service; - sprintf(lu, "%lu", (unsigned long) u->uid); + char lu[DECIMAL_STR_MAX(uid_t) + 1], *service; + sprintf(lu, UID_FMT, u->uid); service = unit_name_build("user", lu, ".service"); if (!service) @@ -503,14 +508,14 @@ static int user_remove_runtime_path(User *u) { r = rm_rf(u->runtime_path, false, false, false); if (r < 0) - log_error("Failed to remove runtime directory %s: %s", u->runtime_path, strerror(-r)); + log_error_errno(r, "Failed to remove runtime directory %s: %m", u->runtime_path); if (umount2(u->runtime_path, MNT_DETACH) < 0) - log_error("Failed to unmount user runtime directory %s: %m", u->runtime_path); + log_error_errno(errno, "Failed to unmount user runtime directory %s: %m", u->runtime_path); r = rm_rf(u->runtime_path, false, true, false); if (r < 0) - log_error("Failed to remove runtime directory %s: %s", u->runtime_path, strerror(-r)); + log_error_errno(r, "Failed to remove runtime directory %s: %m", u->runtime_path); free(u->runtime_path); u->runtime_path = NULL; @@ -572,6 +577,13 @@ int user_finalize(User *u) { if (k < 0) r = k; + /* Clean SysV + POSIX IPC objects */ + if (u->manager->remove_ipc) { + k = clean_ipc(u->uid); + if (k < 0) + r = k; + } + unlink(u->state_file); user_add_to_gc_queue(u); @@ -705,6 +717,56 @@ int user_kill(User *u, int signo) { return manager_kill_unit(u->manager, u->slice, KILL_ALL, signo, NULL); } +void user_elect_display(User *u) { + Session *graphical = NULL, *text = NULL, *other = NULL, *s; + + assert(u); + + /* This elects a primary session for each user, which we call + * the "display". We try to keep the assignment stable, but we + * "upgrade" to better choices. */ + + LIST_FOREACH(sessions_by_user, s, u->sessions) { + + if (s->class != SESSION_USER) + continue; + + if (s->stopping) + continue; + + if (SESSION_TYPE_IS_GRAPHICAL(s->type)) + graphical = s; + else if (s->type == SESSION_TTY) + text = s; + else + other = s; + } + + if (graphical && + (!u->display || + u->display->class != SESSION_USER || + u->display->stopping || + !SESSION_TYPE_IS_GRAPHICAL(u->display->type))) { + u->display = graphical; + return; + } + + if (text && + (!u->display || + u->display->class != SESSION_USER || + u->display->stopping || + u->display->type != SESSION_TTY)) { + u->display = text; + return; + } + + if (other && + (!u->display || + u->display->class != SESSION_USER || + u->display->stopping)) + u->display = other; +} + static const char* const user_state_table[_USER_STATE_MAX] = { [USER_OFFLINE] = "offline", [USER_OPENING] = "opening",