X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind-user.c;h=2733117c641977de41cf08f74e52a7d886eb2d2e;hb=059696ac014da265ee2d1b062cd0dc7bee3d2001;hp=c0b473930db0bf71e69861de2e60ec5b552c2a39;hpb=2f21885d9173a6fae63cc883fa8703b53da2b57b;p=elogind.git diff --git a/src/login/logind-user.c b/src/login/logind-user.c index c0b473930..2733117c6 100644 --- a/src/login/logind-user.c +++ b/src/login/logind-user.c @@ -36,9 +36,10 @@ #include "bus-error.h" #include "conf-parser.h" #include "clean-ipc.h" -#include "logind-user.h" #include "smack-util.h" #include "formats-util.h" +#include "label.h" +#include "logind-user.h" User* user_new(Manager *m, uid_t uid, gid_t gid, const char *name) { User *u; @@ -93,8 +94,11 @@ void user_free(User *u) { free(u->service); } +/// elogind does not support slice and service jobs +#if 0 free(u->slice_job); free(u->service_job); +#endif // 0 free(u->runtime_path); @@ -105,7 +109,7 @@ void user_free(User *u) { free(u); } -int user_save(User *u) { +static int user_save_internal(User *u) { _cleanup_free_ char *temp_path = NULL; _cleanup_fclose_ FILE *f = NULL; int r; @@ -113,16 +117,13 @@ int user_save(User *u) { assert(u); assert(u->state_file); - if (!u->started) - return 0; - r = mkdir_safe_label("/run/systemd/users", 0755, 0, 0); if (r < 0) - goto finish; + goto fail; r = fopen_temporary(u->state_file, &f, &temp_path); if (r < 0) - goto finish; + goto fail; fchmod(fileno(f), 0644); @@ -138,13 +139,19 @@ int user_save(User *u) { if (u->service) fprintf(f, "SERVICE=%s\n", u->service); +/// elogind does not support service jobs +#if 0 if (u->service_job) fprintf(f, "SERVICE_JOB=%s\n", u->service_job); +#endif // 0 if (u->slice) fprintf(f, "SLICE=%s\n", u->slice); +/// elogind does not support slice jobs +#if 0 if (u->slice_job) fprintf(f, "SLICE_JOB=%s\n", u->slice_job); +#endif // 0 if (u->display) fprintf(f, "DISPLAY=%s\n", u->display->id); @@ -243,19 +250,33 @@ int user_save(User *u) { fputc('\n', f); } - fflush(f); + r = fflush_and_check(f); + if (r < 0) + goto fail; - if (ferror(f) || rename(temp_path, u->state_file) < 0) { + if (rename(temp_path, u->state_file) < 0) { r = -errno; - unlink(u->state_file); - unlink(temp_path); + goto fail; } -finish: - if (r < 0) - log_error_errno(r, "Failed to save user data %s: %m", u->state_file); + return 0; - return r; +fail: + (void) unlink(u->state_file); + + if (temp_path) + (void) unlink(temp_path); + + return log_error_errno(r, "Failed to save user data %s: %m", u->state_file); +} + +int user_save(User *u) { + assert(u); + + if (!u->started) + return 0; + + return user_save_internal (u); } int user_load(User *u) { @@ -268,9 +289,15 @@ int user_load(User *u) { r = parse_env_file(u->state_file, NEWLINE, "RUNTIME", &u->runtime_path, "SERVICE", &u->service, +/// elogind does not support service jobs +#if 0 "SERVICE_JOB", &u->service_job, +#endif // 0 "SLICE", &u->slice, +/// elogind does not support slice jobs +#if 0 "SLICE_JOB", &u->slice_job, +#endif // 0 "DISPLAY", &display, "REALTIME", &realtime, "MONOTONIC", &monotonic, @@ -323,7 +350,7 @@ static int user_mkdir_runtime_path(User *u) { if (path_is_mount_point(p, 0) <= 0) { _cleanup_free_ char *t = NULL; - (void) mkdir(p, 0700); + (void) mkdir_label(p, 0700); 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); @@ -351,6 +378,10 @@ static int user_mkdir_runtime_path(User *u) { goto fail; } } + + r = label_fix(p, false, false); + if (r < 0) + log_warning_errno(r, "Failed to fix label of '%s', ignoring: %m", p); } u->runtime_path = p; @@ -368,7 +399,7 @@ fail: } static int user_start_slice(User *u) { - char *job; + // char *job; int r; assert(u); @@ -382,15 +413,21 @@ static int user_start_slice(User *u) { if (r < 0) return r; +/// elogind : Do not try to use dbus to ask systemd +#if 0 r = manager_start_unit(u->manager, slice, &error, &job); +#endif // 0 if (r < 0) { log_error("Failed to start user slice: %s", bus_error_message(&error, r)); free(slice); } else { u->slice = slice; +/// elogind does not support slice jobs +#if 0 free(u->slice_job); u->slice_job = job; +#endif // 0 } } @@ -402,7 +439,7 @@ static int user_start_slice(User *u) { static int user_start_service(User *u) { _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; - char *job; + // char *job; int r; assert(u); @@ -415,15 +452,21 @@ static int user_start_service(User *u) { if (r < 0) return log_error_errno(r, "Failed to build service name: %m"); +/// elogind : Do not try to use dbus to ask systemd +#if 0 r = manager_start_unit(u->manager, service, &error, &job); +#endif // 0 if (r < 0) { log_error("Failed to start user service: %s", bus_error_message(&error, r)); free(service); } else { u->service = service; +/// elogind does not support service jobs +#if 0 free(u->service_job); u->service_job = job; +#endif // 0 } } @@ -453,6 +496,12 @@ int user_start(User *u) { if (r < 0) return r; + /* Save the user data so far, because pam_systemd will read the + * XDG_RUNTIME_DIR out of it while starting up systemd --user. + * We need to do user_save_internal() because we have not + * "officially" started yet. */ + user_save_internal(u); + /* Spawn user systemd */ r = user_start_service(u); if (r < 0) @@ -471,10 +520,12 @@ int user_start(User *u) { return 0; } +/// UNNEEDED by elogind +#if 0 static int user_stop_slice(User *u) { _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; - char *job; - int r; + // char *job; + int r = 0; assert(u); @@ -495,8 +546,8 @@ static int user_stop_slice(User *u) { static int user_stop_service(User *u) { _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; - char *job; - int r; + // char *job; + int r = 0; assert(u); @@ -514,6 +565,7 @@ static int user_stop_service(User *u) { return r; } +#endif // 0 static int user_remove_runtime_path(User *u) { int r; @@ -562,6 +614,8 @@ int user_stop(User *u, bool force) { } /* Kill systemd */ +/// elogind does not support service or slice jobs +#if 0 k = user_stop_service(u); if (k < 0) r = k; @@ -570,6 +624,7 @@ int user_stop(User *u, bool force) { k = user_stop_slice(u); if (k < 0) r = k; +#endif // 0 u->stopping = true; @@ -619,7 +674,7 @@ int user_finalize(User *u) { int user_get_idle_hint(User *u, dual_timestamp *t) { Session *s; bool idle_hint = true; - dual_timestamp ts = { 0, 0 }; + dual_timestamp ts = DUAL_TIMESTAMP_NULL; assert(u); @@ -677,11 +732,14 @@ bool user_check_gc(User *u, bool drop_not_started) { if (user_check_linger_file(u) > 0) return true; +/// elogind does not support systemd services and slices +#if 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; +#endif // 0 return false; } @@ -704,7 +762,12 @@ UserState user_get_state(User *u) { if (u->stopping) return USER_CLOSING; - if (u->slice_job || u->service_job) +/// elogind does not support slice and service jobs +#if 0 + if (!u->started || u->slice_job || u->service_job) +#else + if (!u->started) +#endif // 0 return USER_OPENING; if (u->sessions) { @@ -732,10 +795,15 @@ UserState user_get_state(User *u) { int user_kill(User *u, int signo) { assert(u); +/// FIXME: Without direct cgroup support, elogind can not kill users +#if 0 if (!u->slice) return -ESRCH; return manager_kill_unit(u->manager, u->slice, KILL_ALL, signo, NULL); +#else + return -ESRCH; +#endif // 0 } static bool elect_display_filter(Session *s) { @@ -763,6 +831,9 @@ static int elect_display_compare(Session *s1, Session *s2) { * is preferred. * * s1 or s2 may be NULL. */ + if (!s1 && !s2) + return 0; + if ((s1 == NULL) != (s2 == NULL)) return (s1 == NULL) - (s2 == NULL);