From: Kristian Høgsberg <krh@bitplanet.net>
Date: Sun, 15 Jan 2012 20:51:12 +0000 (-0500)
Subject: xserver: Don't set -logfile option, only available to root user
X-Git-Tag: upstream/0.1.8~3024
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ea093d4883eb4a664f24b0da55d92744d980f3c9;p=profile%2Fivi%2Fweston-ivi-shell.git

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

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)