summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2012-01-15 15:51:12 -0500
committerKristian Høgsberg <krh@bitplanet.net>2012-01-15 15:51:12 -0500
commitea093d4883eb4a664f24b0da55d92744d980f3c9 (patch)
tree734ca04444d2116b5f24a4e51325a49aa8d00c7e
parent92734c567382633f81c3f7c30044ef292a4ead03 (diff)
xserver: Don't set -logfile option, only available to root user
-rw-r--r--src/xserver-launcher.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/xserver-launcher.c b/src/xserver-launcher.c
index 85d66df..5ff472f 100644
--- a/src/xserver-launcher.c
+++ b/src/xserver-launcher.c
@@ -1295,7 +1295,7 @@ static int
weston_xserver_handle_event(int listen_fd, uint32_t mask, void *data)
{
struct weston_xserver *mxs = data;
- char display[8], s[8], logfile[32];
+ char display[8], s[8];
int sv[2], flags;
if (socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, sv) < 0) {
@@ -1316,8 +1316,6 @@ weston_xserver_handle_event(int listen_fd, uint32_t mask, void *data)
setenv("WAYLAND_SOCKET", s, 1);
snprintf(display, sizeof display, ":%d", mxs->display);
- snprintf(logfile, sizeof logfile,
- "/tmp/x-log-%d", mxs->display);
if (execl(XSERVER_PATH,
XSERVER_PATH,
@@ -1325,7 +1323,6 @@ weston_xserver_handle_event(int listen_fd, uint32_t mask, void *data)
"-wayland",
"-rootless",
"-retro",
- "-logfile", logfile,
"-nolisten", "all",
"-terminate",
NULL) < 0)