#include "util.h"
#include "mkdir.h"
+#include "rm-rf.h"
#include "hashmap.h"
#include "fileio.h"
#include "path-util.h"
-#include "special.h"
+// #include "special.h"
#include "unit-name.h"
#include "bus-util.h"
#include "bus-error.h"
#include "conf-parser.h"
#include "clean-ipc.h"
#include "smack-util.h"
+#include "formats-util.h"
#include "label.h"
#include "logind-user.h"
while (u->sessions)
session_free(u->sessions);
+ if (u->slice) {
+ hashmap_remove(u->manager->user_units, u->slice);
+ free(u->slice);
+ }
+
+ if (u->service) {
+ hashmap_remove(u->manager->user_units, u->service);
+ 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);
hashmap_remove(u->manager->users, UID_TO_PTR(u->uid));
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);
if (u->runtime_path)
fprintf(f, "RUNTIME=%s\n", u->runtime_path);
+ 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);
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) {
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,
return r;
}
+static int user_start_slice(User *u) {
+ // char *job;
+ int r;
+
+ assert(u);
+
+ if (!u->slice) {
+ _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+ char lu[DECIMAL_STR_MAX(uid_t) + 1], *slice;
+ sprintf(lu, UID_FMT, u->uid);
+
+ r = slice_build_subslice("user.slice", lu, &slice);
+ 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);
+ if (r < 0) {
+ log_error("Failed to start user slice: %s", bus_error_message(&error, r));
+ free(slice);
+ } else {
+#endif // 0
+ u->slice = slice;
+
+/// elogind does not support slice jobs
+#if 0
+ free(u->slice_job);
+ u->slice_job = job;
+ }
+#endif // 0
+ }
+
+ if (u->slice)
+ hashmap_put(u->manager->user_units, u->slice, u);
+
+ return 0;
+}
+
+static int user_start_service(User *u) {
+ _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+ // char *job;
+ int r;
+
+ assert(u);
+
+ if (!u->service) {
+ char lu[DECIMAL_STR_MAX(uid_t) + 1], *service;
+ sprintf(lu, UID_FMT, u->uid);
+
+ r = unit_name_build("user", lu, ".service", &service);
+ 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
+ }
+ }
+
+ if (u->service)
+ hashmap_put(u->manager->user_units, u->service, u);
+
+ return 0;
+}
+
int user_start(User *u) {
int r;
assert(u);
- if (u->started)
+ if (u->started && !u->stopping)
return 0;
- log_debug("New user %s logged in.", u->name);
+ /*
+ * If u->stopping is set, the user is marked for removal and the slice
+ * and service stop-jobs are queued. We have to clear that flag before
+ * queing the start-jobs again. If they succeed, the user object can be
+ * re-used just fine (pid1 takes care of job-ordering and proper
+ * restart), but if they fail, we want to force another user_stop() so
+ * possibly pending units are stopped.
+ * Note that we don't clear u->started, as we have no clue what state
+ * the user is in on failure here. Hence, we pretend the user is
+ * running so it will be properly taken down by GC. However, we clearly
+ * return an error from user_start() in that case, so no further
+ * reference to the user is taken.
+ */
+ u->stopping = false;
+
+ if (!u->started) {
+ log_debug("New user %s logged in.", u->name);
+
+ /* Make XDG_RUNTIME_DIR */
+ r = user_mkdir_runtime_path(u);
+ if (r < 0)
+ return r;
+ }
- /* Make XDG_RUNTIME_DIR */
- r = user_mkdir_runtime_path(u);
+ /* Create cgroup */
+ r = user_start_slice(u);
if (r < 0)
return r;
* "officially" started yet. */
user_save_internal(u);
- if (!dual_timestamp_is_set(&u->timestamp))
- dual_timestamp_get(&u->timestamp);
+ /* Spawn user systemd */
+ r = user_start_service(u);
+ if (r < 0)
+ return r;
- u->started = true;
+ if (!u->started) {
+ if (!dual_timestamp_is_set(&u->timestamp))
+ dual_timestamp_get(&u->timestamp);
+ user_send_signal(u, true);
+ u->started = true;
+ }
/* Save new user data */
user_save(u);
- user_send_signal(u, true);
-
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 = 0;
+
+ assert(u);
+
+ 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_message(&error, r));
+ return r;
+ }
+
+ free(u->slice_job);
+ u->slice_job = job;
+
+ return r;
+}
+
+static int user_stop_service(User *u) {
+ _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+ // char *job;
+ int r = 0;
+
+ assert(u);
+
+ 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_message(&error, r));
+ return r;
+ }
+
+ free(u->service_job);
+ u->service_job = job;
+
+ return r;
+}
+#endif // 0
+
static int user_remove_runtime_path(User *u) {
int r;
if (!u->runtime_path)
return 0;
- r = rm_rf(u->runtime_path, false, false, false);
+ r = rm_rf(u->runtime_path, 0);
if (r < 0)
log_error_errno(r, "Failed to remove runtime directory %s: %m", u->runtime_path);
if (r < 0 && errno != EINVAL && errno != ENOENT)
log_error_errno(errno, "Failed to unmount user runtime directory %s: %m", u->runtime_path);
- r = rm_rf(u->runtime_path, false, true, false);
+ r = rm_rf(u->runtime_path, REMOVE_ROOT);
if (r < 0)
log_error_errno(r, "Failed to remove runtime directory %s: %m", u->runtime_path);
- free(u->runtime_path);
- u->runtime_path = NULL;
+ u->runtime_path = mfree(u->runtime_path);
return r;
}
r = k;
}
+ /* Kill systemd */
+/// elogind does not support service or slice jobs
+#if 0
+ k = user_stop_service(u);
+ if (k < 0)
+ r = k;
+
+ /* Kill cgroup */
+ k = user_stop_slice(u);
+ if (k < 0)
+ r = k;
+#endif // 0
+
u->stopping = true;
user_save(u);
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;
}
if (u->stopping)
return USER_CLOSING;
+/// 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) {
bool all_closing = true;
}
int user_kill(User *u, int signo) {
+/// Without systemd unit support, elogind has to rely on its session system
+#if 0
+ assert(u);
+
+ if (!u->slice)
+ return -ESRCH;
+
+ return manager_kill_unit(u->manager, u->slice, KILL_ALL, signo, NULL);
+#else
+ Session *s;
+ int res = 0;
+
assert(u);
- /* FIXME: No way to kill a user without systemd. */
- return -ESRCH;
+ LIST_FOREACH(sessions_by_user, s, u->sessions) {
+ int r = session_kill(s, KILL_ALL, signo);
+ if (res == 0 && r < 0)
+ res = r;
+ }
+
+ return res;
+#endif // 0
}
static bool elect_display_filter(Session *s) {
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;