X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogind-session.c;h=6b3b277897544084b844aef1331e6b8c02ada2d0;hb=3f49d45a45c6c585098590174c3245d2d9bdde0a;hp=c10f5e62c9278f16f60ccba83be9a59927814ec0;hpb=5eda94dda25bccda928c4b33c790dbe748573a22;p=elogind.git

diff --git a/src/logind-session.c b/src/logind-session.c
index c10f5e62c..6b3b27789 100644
--- a/src/logind-session.c
+++ b/src/logind-session.c
@@ -34,7 +34,7 @@ Session* session_new(Manager *m, User *u, const char *id) {
         assert(m);
         assert(id);
 
-        s = new(Session, 1);
+        s = new0(Session, 1);
         if (!s)
                 return NULL;
 
@@ -56,7 +56,7 @@ Session* session_new(Manager *m, User *u, const char *id) {
         s->pipe_fd = -1;
         s->user = u;
 
-        dual_timestamp_get(&s->timestamp);
+        LIST_PREPEND(Session, sessions_by_user, u->sessions, s);
 
         return s;
 }
@@ -64,6 +64,9 @@ Session* session_new(Manager *m, User *u, const char *id) {
 void session_free(Session *s) {
         assert(s);
 
+        if (s->in_gc_queue)
+                LIST_REMOVE(Session, gc_queue, s->manager->session_gc_queue, s);
+
         if (s->user) {
                 LIST_REMOVE(Session, sessions_by_user, s->user->sessions, s);
 
@@ -80,6 +83,7 @@ void session_free(Session *s) {
         free(s->tty);
         free(s->display);
         free(s->remote_host);
+        free(s->remote_user);
 
         hashmap_remove(s->manager->sessions, s->id);
 
@@ -90,19 +94,22 @@ void session_free(Session *s) {
 int session_save(Session *s) {
         FILE *f;
         int r = 0;
+        char *temp_path;
 
         assert(s);
 
         r = safe_mkdir("/run/systemd/session", 0755, 0, 0);
         if (r < 0)
-                return r;
+                goto finish;
 
-        f = fopen(s->state_file, "we");
-        if (!f)
-                return -errno;
+        r = fopen_temporary(s->state_file, &f, &temp_path);
+        if (r < 0)
+                goto finish;
 
         assert(s->user);
 
+        fchmod(fileno(f), 0644);
+
         fprintf(f,
                 "# This is private data. Do not parse.\n"
                 "UID=%lu\n"
@@ -141,6 +148,11 @@ int session_save(Session *s) {
                         "REMOTE_HOST=%s\n",
                         s->remote_host);
 
+        if (s->remote_user)
+                fprintf(f,
+                        "REMOTE_USER=%s\n",
+                        s->remote_user);
+
         if (s->seat && s->seat->manager->vtconsole == s->seat)
                 fprintf(f,
                         "VTNR=%i\n",
@@ -157,12 +169,20 @@ int session_save(Session *s) {
                         (unsigned long long) s->audit_id);
 
         fflush(f);
-        if (ferror(f)) {
+
+        if (ferror(f) || rename(temp_path, s->state_file) < 0) {
                 r = -errno;
                 unlink(s->state_file);
+                unlink(temp_path);
         }
 
         fclose(f);
+        free(temp_path);
+
+finish:
+        if (r < 0)
+                log_error("Failed to save session data for %s: %s", s->id, strerror(-r));
+
         return r;
 }
 
@@ -196,10 +216,7 @@ int session_activate(Session *s) {
         old_active = s->seat->active;
         s->seat->active = s;
 
-        seat_apply_acls(s->seat, old_active);
-        manager_spawn_autovt(s->manager, s->vtnr);
-
-        return 0;
+        return seat_apply_acls(s->seat, old_active);
 }
 
 bool x11_display_is_local(const char *display) {
@@ -333,11 +350,6 @@ int session_start(Session *s) {
         assert(s);
         assert(s->user);
 
-        /* Create user first */
-        r = user_start(s->user);
-        if (r < 0)
-                return r;
-
         /* Create cgroup */
         r = session_create_cgroup(s);
         if (r < 0)
@@ -345,6 +357,12 @@ int session_start(Session *s) {
 
         /* Create X11 symlink */
         session_link_x11_socket(s);
+
+        /* Save session data */
+        session_save(s);
+
+        dual_timestamp_get(&s->timestamp);
+
         return 0;
 }
 
@@ -429,6 +447,9 @@ int session_stop(Session *s) {
         /* Remove X11 symlink */
         session_unlink_x11_socket(s);
 
+        unlink(s->state_file);
+        session_add_to_gc_queue(s);
+
         return r;
 }
 
@@ -452,7 +473,7 @@ int session_check_gc(Session *s) {
                 if (r < 0)
                         return r;
 
-                if (r <= 0)
+                if (r == 0)
                         return 1;
         }
 
@@ -469,8 +490,18 @@ int session_check_gc(Session *s) {
         return 0;
 }
 
+void session_add_to_gc_queue(Session *s) {
+        assert(s);
+
+        if (s->in_gc_queue)
+                return;
+
+        LIST_PREPEND(Session, gc_queue, s->manager->session_gc_queue, s);
+        s->in_gc_queue = true;
+}
+
 static const char* const session_type_table[_SESSION_TYPE_MAX] = {
-        [SESSION_TERMINAL] = "terminal",
+        [SESSION_TTY] = "tty",
         [SESSION_X11] = "x11"
 };