Attachment 582782 Details for Bug 814690 – this seems to fix it for me

[patch] this seems to fix it for me

fix-logout.patch (text/plain), 4.41 KB, created by Ray Strode [halfline] on 2012-05-07 20:27:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ray Strode [halfline]

Created: 2012-05-07 20:27:59 UTC

Size: 4.41 KB

patch

obsolete

>From 5dc9ff7b20cb7853b9a09c243d99b1ca708ce739 Mon Sep 17 00:00:00 2001
>From: Ray Strode <rstrode@redhat.com>
>Date: Mon, 7 May 2012 12:26:07 -0400
>Subject: [PATCH 1/2] logind: make sure to terminate user state file lines
>
>They were only getting newlines if had any values in
>them.
>---
> src/login/logind-user.c |   33 +++++++++++++++++++++++++++++----
> 1 file changed, 29 insertions(+), 4 deletions(-)
>
>diff --git a/src/login/logind-user.c b/src/login/logind-user.c
>index 27f78ad..bbdeb1d 100644
>--- a/src/login/logind-user.c
>+++ b/src/login/logind-user.c
>@@ -137,40 +137,65 @@ int user_save(User *u) {
> 
>         if (u->sessions) {
>                 Session *i;
>+                bool needs_newline;
> 
>                 fputs("SESSIONS=", f);
>+                needs_newline = true;
>                 LIST_FOREACH(sessions_by_user, i, u->sessions) {
>                         fprintf(f,
>                                 "%s%c",
>                                 i->id,
>                                 i->sessions_by_user_next ? ' ' : '\n');
>+                        needs_newline = false;
>                 }
> 
>+                if (needs_newline)
>+                        fputc('\n', f);
>+
>                 fputs("SEATS=", f);
>+                needs_newline = true;
>                 LIST_FOREACH(sessions_by_user, i, u->sessions) {
>-                        if (i->seat)
>+                        if (i->seat) {
>                                 fprintf(f,
>                                         "%s%c",
>                                         i->seat->id,
>                                         i->sessions_by_user_next ? ' ' : '\n');
>+                                needs_newline = false;
>+                        }
>                 }
> 
>+                if (needs_newline)
>+                        fputc('\n', f);
>+
>                 fputs("ACTIVE_SESSIONS=", f);
>-                LIST_FOREACH(sessions_by_user, i, u->sessions)
>-                        if (session_is_active(i))
>+                needs_newline = true;
>+                LIST_FOREACH(sessions_by_user, i, u->sessions) {
>+                        if (session_is_active(i)) {
>                                 fprintf(f,
>                                         "%lu%c",
>                                         (unsigned long) i->user->uid,
>                                         i->sessions_by_user_next ? ' ' : '\n');
>+                                needs_newline = false;
>+                        }
>+                }
>+
>+                if (needs_newline)
>+                        fputc('\n', f);
> 
>                 fputs("ACTIVE_SEATS=", f);
>+                needs_newline = true;
>                 LIST_FOREACH(sessions_by_user, i, u->sessions) {
>-                        if (session_is_active(i) && i->seat)
>+                        if (session_is_active(i) && i->seat) {
>                                 fprintf(f,
>                                         "%s%c",
>                                         i->seat->id,
>                                         i->sessions_by_user_next ? ' ' : '\n');
>+                                needs_newline = false;
>+                        }
>                 }
>+
>+                if (needs_newline)
>+                        fputc('\n', f);
>         }
> 
>         fflush(f);
>-- 
>1.7.10
>
>
>From aab62b4c7178cf6d1a64293761221a69546c9a4b Mon Sep 17 00:00:00 2001
>From: Ray Strode <rstrode@redhat.com>
>Date: Mon, 7 May 2012 15:05:14 -0400
>Subject: [PATCH 2/2] logind: reap user when cgroups go away
>
>---
> src/login/logind.c |   21 +++++++++++++++++++++
> 1 file changed, 21 insertions(+)
>
>diff --git a/src/login/logind.c b/src/login/logind.c
>index 5860bfc..cb46f2e 100644
>--- a/src/login/logind.c
>+++ b/src/login/logind.c
>@@ -918,6 +918,27 @@ int manager_get_session_by_pid(Manager *m, pid_t pid, Session **session) {
> void manager_cgroup_notify_empty(Manager *m, const char *cgroup) {
>         Session *s;
>         int r;
>+        char *path;
>+
>+        r = cg_get_path(SYSTEMD_CGROUP_CONTROLLER, cgroup, NULL, &path);
>+
>+        if (r == 0) {
>+            struct stat st;
>+
>+            r = stat(path, &st);
>+
>+            if (r == 0) {
>+                    User *u;
>+
>+                    u = hashmap_get(m->users, ULONG_TO_PTR((unsigned long) st.st_uid));
>+
>+                    if (u) {
>+                            user_add_to_gc_queue(u);
>+                    }
>+            }
>+
>+            free(path);
>+        }
> 
>         r = manager_get_session_by_cgroup(m, cgroup, &s);
>         if (r <= 0)
>-- 
>1.7.10
>

Actions: View | Diff

Attachments on bug 814690: 578989 | 581585 | 582752 | 582782