1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
From f5555b045a64231d4beaba51cbbf5f5485173900 Mon Sep 17 00:00:00 2001
From: Ronan Le Martret <ronan.lemartret@iot.bzh>
Date: Fri, 14 Apr 2017 19:04:32 +0200
Subject: [PATCH] Allow regular users to launch Weston
Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
---
configure.ac | 6 ++++++
src/launcher-direct.c | 2 ++
2 files changed, 8 insertions(+)
diff --git a/configure.ac b/configure.ac
index 1d11864..4e48d52 100644
--- a/configure.ac
+++ b/configure.ac
@@ -131,6 +131,12 @@ if test x$enable_xkbcommon = xyes; then
COMPOSITOR_MODULES="$COMPOSITOR_MODULES xkbcommon >= 0.3.0"
fi
+AC_ARG_ENABLE(sys-uid, [ --enable-sys-uid],,
+ enable_sys_uid=no)
+if test x$enable_sys_uid = xyes; then
+ AC_DEFINE(ENABLE_SYS_UID, [1], [Allow regular users to launch Weston])
+fi
+
AC_ARG_ENABLE(setuid-install, [ --enable-setuid-install],,
enable_setuid_install=yes)
AM_CONDITIONAL(ENABLE_SETUID_INSTALL, test x$enable_setuid_install = xyes)
diff --git a/src/launcher-direct.c b/src/launcher-direct.c
index 29d9c28..1ac6651 100644
--- a/src/launcher-direct.c
+++ b/src/launcher-direct.c
@@ -272,8 +272,10 @@ launcher_direct_connect(struct weston_launcher **out, struct weston_compositor *
{
struct launcher_direct *launcher;
+#ifndef ENABLE_SYS_UID
if (geteuid() != 0)
return -EINVAL;
+#endif
launcher = zalloc(sizeof(*launcher));
if (launcher == NULL)
--
2.6.6
|