From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 1 Jul 2011 20:34:58 +0000 (+0200)
Subject: logind: create private subdirectory for X11 socket
X-Git-Tag: v30~76
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0254daedb1b67a16c6d54b964b31b5e8eaa4ac4c;p=systemd

logind: create private subdirectory for X11 socket
---

diff --git a/src/logind-session.c b/src/logind-session.c
index cadf9328..ab4de66c 100644
--- a/src/logind-session.c
+++ b/src/logind-session.c
@@ -380,13 +380,15 @@ static int session_link_x11_socket(Session *s) {
                 return -ENOENT;
         }
 
-        t = strappend(s->user->runtime_path, "/display");
+        t = strappend(s->user->runtime_path, "/X11/display");
         if (!t) {
                 log_error("Out of memory");
                 free(f);
                 return -ENOMEM;
         }
 
+        mkdir_parents(t, 0755);
+
         if (link(f, t) < 0) {
                 if (errno == EEXIST) {
                         unlink(t);
@@ -638,7 +640,7 @@ static int session_unlink_x11_socket(Session *s) {
 
         s->user->display = NULL;
 
-        t = strappend(s->user->runtime_path, "/display");
+        t = strappend(s->user->runtime_path, "/X11/display");
         if (!t) {
                 log_error("Out of memory");
                 return -ENOMEM;