logind: rename vtconsole to seat0

[elogind.git] / src / login / logind-session.c

diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index db22150825059f3411c09196205f43c54e434401..407429c48a11766ead16037c987eac55aa3056f7 100644 (file)
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -32,7 +32,6 @@
 #include "util.h"
 #include "mkdir.h"
 #include "path-util.h"
-#include "cgroup-util.h"
 #include "fileio.h"
 #include "dbus-common.h"
 #include "logind-session.h"
@@ -42,6 +41,7 @@ Session* session_new(Manager *m, const char *id) {
 
         assert(m);
         assert(id);
+        assert(session_id_valid(id));
 
         s = new0(Session, 1);
         if (!s)
@@ -73,6 +73,8 @@ void session_free(Session *s) {
         if (s->in_gc_queue)
                 LIST_REMOVE(Session, gc_queue, s->manager->session_gc_queue, s);
 
+        session_drop_controller(s);
+
         if (s->user) {
                 LIST_REMOVE(Session, sessions_by_user, s->user->sessions, s);
 
@@ -358,8 +360,6 @@ int session_load(Session *s) {
 }
 
 int session_activate(Session *s) {
-        int r;
-
         assert(s);
         assert(s->user);
 
@@ -372,17 +372,14 @@ int session_activate(Session *s) {
         if (s->seat->active == s)
                 return 0;
 
-        assert(seat_is_vtconsole(s->seat));
+        assert(seat_is_seat0(s->seat));
 
-        r = chvt(s->vtnr);
-        if (r < 0)
-                return r;
-
-        return seat_set_active(s->seat, s);
+        return chvt(s->vtnr);
 }
 
 static int session_link_x11_socket(Session *s) {
-        char *t, *f, *c;
+        _cleanup_free_ char *t = NULL, *f = NULL;
+        char *c;
         size_t k;
 
         assert(s);
@@ -406,7 +403,6 @@ static int session_link_x11_socket(Session *s) {
 
         if (access(f, F_OK) < 0) {
                 log_warning("Session %s has display %s with non-existing socket %s.", s->id, s->display, f);
-                free(f);
                 return -ENOENT;
         }
 
@@ -415,10 +411,8 @@ static int session_link_x11_socket(Session *s) {
          * path is owned by the user */
 
         t = strappend(s->user->runtime_path, "/X11-display");
-        if (!t) {
-                free(f);
+        if (!t)
                 return log_oom();
-        }
 
         if (link(f, t) < 0) {
                 if (errno == EEXIST) {
@@ -438,17 +432,12 @@ static int session_link_x11_socket(Session *s) {
                         }
 
                         log_error("Failed to link %s to %s: %m", f, t);
-                        free(f);
-                        free(t);
                         return -errno;
                 }
         }
 
 done:
         log_info("Linked %s to %s.", f, t);
-        free(f);
-        free(t);
-
         s->user->display = s;
 
         return 0;
@@ -466,17 +455,23 @@ static int session_start_scope(Session *s) {
 
         if (!s->scope) {
                 _cleanup_free_ char *description = NULL;
+                const char *kill_mode;
                 char *scope, *job;
 
+                description = strjoin("Session ", s->id, " of user ", s->user->name, NULL);
+                if (!description)
+                        return log_oom();
+
                 scope = strjoin("session-", s->id, ".scope", NULL);
                 if (!scope)
                         return log_oom();
 
-                description = strjoin("Session ", s->id, " of user ", s->user->name, NULL);
+                kill_mode = manager_shall_kill(s->manager, s->user->name) ? "control-group" : "none";
 
-                r = manager_start_scope(s->manager, scope, s->leader, s->user->slice, description, "systemd-user-sessions.service", &error, &job);
+                r = manager_start_scope(s->manager, scope, s->leader, s->user->slice, description, "systemd-user-sessions.service", kill_mode, &error, &job);
                 if (r < 0) {
-                        log_error("Failed to start session scope: %s %s", bus_error(&error, r), error.name);
+                        log_error("Failed to start session scope %s: %s %s",
+                                  scope, bus_error(&error, r), error.name);
                         dbus_error_free(&error);
 
                         free(scope);
@@ -554,21 +549,6 @@ int session_start(Session *s) {
         return 0;
 }
 
-/* static bool session_shall_kill(Session *s) { */
-/*         assert(s); */
-
-/*         if (!s->kill_processes) */
-/*                 return false; */
-
-/*         if (strv_contains(s->manager->kill_exclude_users, s->user->name)) */
-/*                 return false; */
-
-/*         if (strv_isempty(s->manager->kill_only_users)) */
-/*                 return true; */
-
-/*         return strv_contains(s->manager->kill_only_users, s->user->name); */
-/* } */
-
 static int session_stop_scope(Session *s) {
         DBusError error;
         char *job;
@@ -595,7 +575,7 @@ static int session_stop_scope(Session *s) {
 }
 
 static int session_unlink_x11_socket(Session *s) {
-        char *t;
+        _cleanup_free_ char *t = NULL;
         int r;
 
         assert(s);
@@ -611,13 +591,27 @@ static int session_unlink_x11_socket(Session *s) {
                 return log_oom();
 
         r = unlink(t);
-        free(t);
-
         return r < 0 ? -errno : 0;
 }
 
 int session_stop(Session *s) {
-        int r = 0, k;
+        int r;
+
+        assert(s);
+
+        if (!s->user)
+                return -ESTALE;
+
+        /* Kill cgroup */
+        r = session_stop_scope(s);
+
+        session_save(s);
+
+        return r;
+}
+
+int session_finalize(Session *s) {
+        int r = 0;
 
         assert(s);
 
@@ -633,11 +627,6 @@ int session_stop(Session *s) {
                            "MESSAGE=Removed session %s.", s->id,
                            NULL);
 
-        /* Kill cgroup */
-        k = session_stop_scope(s);
-        if (k < 0)
-                r = k;
-
         /* Remove X11 symlink */
         session_unlink_x11_socket(s);
 
@@ -645,10 +634,10 @@ int session_stop(Session *s) {
         session_add_to_gc_queue(s);
         user_add_to_gc_queue(s->user);
 
-        if (s->started)
+        if (s->started) {
                 session_send_signal(s, false);
-
-        s->started = false;
+                s->started = false;
+        }
 
         if (s->seat) {
                 if (s->seat->active == s)
@@ -871,7 +860,6 @@ int session_check_gc(Session *s, bool drop_not_started) {
                 return 0;
 
         if (s->fifo_fd >= 0) {
-
                 r = pipe_eof(s->fifo_fd);
                 if (r < 0)
                         return r;
@@ -902,8 +890,11 @@ void session_add_to_gc_queue(Session *s) {
 SessionState session_get_state(Session *s) {
         assert(s);
 
+        if (s->closing)
+                return SESSION_CLOSING;
+
         if (s->scope_job)
-                return s->started ? SESSION_OPENING : SESSION_CLOSING;
+                return SESSION_OPENING;
 
         if (s->fifo_fd < 0)
                 return SESSION_CLOSING;
@@ -923,6 +914,52 @@ int session_kill(Session *s, KillWho who, int signo) {
         return manager_kill_unit(s->manager, s->scope, who, signo, NULL);
 }
 
+bool session_is_controller(Session *s, const char *sender)
+{
+        assert(s);
+
+        return streq_ptr(s->controller, sender);
+}
+
+int session_set_controller(Session *s, const char *sender, bool force) {
+        char *t;
+        int r;
+
+        assert(s);
+        assert(sender);
+
+        if (session_is_controller(s, sender))
+                return 0;
+        if (s->controller && !force)
+                return -EBUSY;
+
+        t = strdup(sender);
+        if (!t)
+                return -ENOMEM;
+
+        r = manager_watch_busname(s->manager, sender);
+        if (r) {
+                free(t);
+                return r;
+        }
+
+        session_drop_controller(s);
+
+        s->controller = t;
+        return 0;
+}
+
+void session_drop_controller(Session *s) {
+        assert(s);
+
+        if (!s->controller)
+                return;
+
+        manager_drop_busname(s->manager, s->controller);
+        free(s->controller);
+        s->controller = NULL;
+}
+
 static const char* const session_state_table[_SESSION_STATE_MAX] = {
         [SESSION_OPENING] = "opening",
         [SESSION_ONLINE] = "online",