chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
129eebe
)
logind: move X11 socket
author
Lennart Poettering
<lennart@poettering.net>
Tue, 17 Jan 2012 13:03:00 +0000
(14:03 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Wed, 18 Jan 2012 12:56:02 +0000
(13:56 +0100)
src/login/logind-session.c
patch
|
blob
|
history
diff --git
a/src/login/logind-session.c
b/src/login/logind-session.c
index e78af02f0590cd55c0747a6874bade9586732f28..bb802e5fc293176cbe9da97bb9fafc6f3205f53b 100644
(file)
--- a/
src/login/logind-session.c
+++ b/
src/login/logind-session.c
@@
-376,15
+376,13
@@
static int session_link_x11_socket(Session *s) {
return -ENOENT;
}
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;
}
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);
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;
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;
if (!t) {
log_error("Out of memory");
return -ENOMEM;