chiark / gitweb /
logind: move X11 socket
authorLennart Poettering <lennart@poettering.net>
Tue, 17 Jan 2012 13:03:00 +0000 (14:03 +0100)
committerLennart Poettering <lennart@poettering.net>
Wed, 18 Jan 2012 12:56:02 +0000 (13:56 +0100)
src/login/logind-session.c

index e78af02..bb802e5 100644 (file)
@@ -376,15 +376,13 @@ static int session_link_x11_socket(Session *s) {
                 return -ENOENT;
         }
 
-        t = strappend(s->user->runtime_path, "/X11/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);
@@ -637,7 +635,7 @@ static int session_unlink_x11_socket(Session *s) {
 
         s->user->display = NULL;
 
-        t = strappend(s->user->runtime_path, "/X11/display");
+        t = strappend(s->user->runtime_path, "/X11-display");
         if (!t) {
                 log_error("Out of memory");
                 return -ENOMEM;