X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind-user.c;h=63adc821080c9f4d9d12166c78f7bcda4205188c;hb=e42398b28a4d24b716484cffb2afedf0db55ee98;hp=21d7268120a9b115ce621951d8447cc86370a3c1;hpb=31e57d94c86e0a4f332f30033b10e402fec4aac7;p=elogind.git

diff --git a/src/login/logind-user.c b/src/login/logind-user.c
index 21d726812..63adc8210 100644
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -30,7 +30,7 @@
 #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"
@@ -94,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);
 
@@ -116,11 +119,11 @@ static int user_save_internal(User *u) {
 
         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);
 
@@ -136,13 +139,19 @@ static int user_save_internal(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);
@@ -241,19 +250,24 @@ static int user_save_internal(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) {
@@ -275,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,
@@ -379,7 +399,7 @@ fail:
 }
 
 static int user_start_slice(User *u) {
-        char *job;
+        // char *job;
         int r;
 
         assert(u);
@@ -389,20 +409,26 @@ static int user_start_slice(User *u) {
                 char lu[DECIMAL_STR_MAX(uid_t) + 1], *slice;
                 sprintf(lu, UID_FMT, u->uid);
 
-                r = slice_build_subslice(SPECIAL_USER_SLICE, lu, &slice);
+                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)
@@ -413,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);
@@ -426,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
                 }
         }
 
@@ -488,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);
 
@@ -512,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);
 
@@ -531,6 +565,7 @@ static int user_stop_service(User *u) {
 
         return r;
 }
+#endif // 0
 
 static int user_remove_runtime_path(User *u) {
         int r;
@@ -555,8 +590,7 @@ static int user_remove_runtime_path(User *u) {
         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;
 }
@@ -579,6 +613,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;
@@ -587,6 +623,7 @@ int user_stop(User *u, bool force) {
         k = user_stop_slice(u);
         if (k < 0)
                 r = k;
+#endif // 0
 
         u->stopping = true;
 
@@ -694,11 +731,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;
 }
@@ -721,7 +761,12 @@ UserState user_get_state(User *u) {
         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) {
@@ -747,12 +792,28 @@ UserState user_get_state(User *u) {
 }
 
 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);
+
+        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) {