mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xserver: Don't set -logfile option, only available to root user

Browse Source
This commit is contained in:
Kristian Høgsberg
2012-01-15 15:51:12 -05:00
parent 92734c5673
commit ea093d4883
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/xserver-launcher.c
+1 -4
View File
@@ -1295,7 +1295,7 @@ static int
weston_xserver_handle_event(int listen_fd, uint32_t mask, void *data) weston_xserver_handle_event(int listen_fd, uint32_t mask, void *data)
{ {
struct weston_xserver *mxs = data; struct weston_xserver *mxs = data;
char display[8], s[8], logfile[32]; char display[8], s[8];
int sv[2], flags; int sv[2], flags;
if (socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, sv) < 0) { 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); setenv("WAYLAND_SOCKET", s, 1);
snprintf(display, sizeof display, ":%d", mxs->display); snprintf(display, sizeof display, ":%d", mxs->display);
snprintf(logfile, sizeof logfile,
"/tmp/x-log-%d", mxs->display);
if (execl(XSERVER_PATH, if (execl(XSERVER_PATH,
XSERVER_PATH, XSERVER_PATH,
@@ -1325,7 +1323,6 @@ weston_xserver_handle_event(int listen_fd, uint32_t mask, void *data)
"-wayland", "-wayland",
"-rootless", "-rootless",
"-retro", "-retro",
"-logfile", logfile,
"-nolisten", "all", "-nolisten", "all",
"-terminate", "-terminate",
NULL) < 0) NULL) < 0)