From 1da729667d5510874262f6aa09655a8f3296ebf8 Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Sun, 3 Sep 2006 09:35:28 +0000
Subject: [PATCH] fix suid of e_sys - fix freqset suid install

SVN revision: 25396
---
 src/bin/Makefile.am             | 2 +-
 src/bin/e_sys_main.c            | 6 ++++++
 src/modules/cpufreq/Makefile.am | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 5671cc52e..92f65b3de 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -388,7 +388,7 @@ e_sys_main.c
 
 enlightenment_sys_LDFLAGS = @e_libs@ @dlopen_libs@
 
-setuid_root_mode = a=rx,u+s
+setuid_root_mode = a=rx,u+xs
 install-exec-hook:
 	@chmod $(setuid_root_mode) $(DESTDIR)$(bindir)/enlightenment_sys$(EXEEXT) || true
 
diff --git a/src/bin/e_sys_main.c b/src/bin/e_sys_main.c
index 53a3cb892..b605b6ba8 100644
--- a/src/bin/e_sys_main.c
+++ b/src/bin/e_sys_main.c
@@ -53,6 +53,12 @@ main(int argc, char **argv)
      {
 	exit(-1);
      }
+
+   if (seteuid(0))
+     {
+	printf("ERROR: UNABLE TO ASSUME ROOT PRIVILEDGES\n");
+	exit(5);
+     }
    
    evas_init();
 
diff --git a/src/modules/cpufreq/Makefile.am b/src/modules/cpufreq/Makefile.am
index 5551a3c0c..b124333ba 100644
--- a/src/modules/cpufreq/Makefile.am
+++ b/src/modules/cpufreq/Makefile.am
@@ -27,9 +27,9 @@ module_la_DEPENDENCIES = $(top_builddir)/config.h
 freqsetdir = $(pkgdir)
 freqset_DATA = \
 freqset$(EXEEXT)
-setuid_root_mode = a=rx,u+s
 
-install-exec-hook:
+setuid_root_mode = a=rx,u+xs
+install-data-hook:
 	@chmod $(setuid_root_mode) $(DESTDIR)$(freqsetdir)/freqset$(EXEEXT) || true
 
 noinst_PROGRAMS        = freqset