summaryrefslogtreecommitdiff
path: root/xserver/hw/xfree86/utils/xorgcfg/startx.c
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2006-11-28 20:29:33 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2006-11-28 20:29:33 +0000
commit70ce0341935fd116216e76d40ef65d969227e892 (patch)
tree6c3f151e6258cb75b0b1983e1e563d2b95ec457d /xserver/hw/xfree86/utils/xorgcfg/startx.c
parentdf6b77dc03dec3df43fadeb2f3a4912966e93ea1 (diff)
OpenBSD local modifications:
- privilege separation - some snprintf/strlc{at,py} conversions - support for more architectures - signal handler fixes - default mouse wheel support in config tools - sunmouse protocol
Diffstat (limited to 'xserver/hw/xfree86/utils/xorgcfg/startx.c')
-rw-r--r--xserver/hw/xfree86/utils/xorgcfg/startx.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/xserver/hw/xfree86/utils/xorgcfg/startx.c b/xserver/hw/xfree86/utils/xorgcfg/startx.c
index 7b730c9aa..983406a6e 100644
--- a/xserver/hw/xfree86/utils/xorgcfg/startx.c
+++ b/xserver/hw/xfree86/utils/xorgcfg/startx.c
@@ -108,8 +108,15 @@ startx(void)
XmuSnprintf(path, sizeof(path), "%s/"__XSERVERNAME__, XFree86_path);
else
XmuSnprintf(path, sizeof(path), "%s/bin/"__XSERVERNAME__, XFree86Dir);
- execl(path, "X", ":8", /*"+xinerama",*/ "+accessx","-allowMouseOpenFail",
+#ifndef X_PRIVSEP
+ execl(path, "X", ":8", /*"+xinerama",*/ "+accessx",
+ "-allowMouseOpenFail", "-nolisten", "tcp",
"-xf86config", XF86Config_path, (void *)NULL);
+#else
+ execl(path, "X", ":8", /*"+xinerama",*/ "+accessx",
+ "-allowMouseOpenFail", "-keepPriv", "-nolisten", "tcp",
+ "-xf86config", XF86Config_path, (void *)NULL);
+#endif
exit(-127);
} break;
case -1: