[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdelibs/kinit
From:       Dirk Mueller <mueller () kde ! org>
Date:       2006-10-26 5:37:10
Message-ID: 1161841030.502432.29417.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 599168 by mueller:

don't install start_kdeinit suid root on non-linux


 M  +3 -8      Makefile.am  
 M  +4 -2      configure.in.in  


--- branches/KDE/3.5/kdelibs/kinit/Makefile.am #599167:599168
@@ -82,14 +82,9 @@
 dummy.cpp:
 	echo > dummy.cpp
 
-if KDEINIT_SETUID
-# start_kdeinit needs to be installed setuid root on Linux
 install-exec-hook:
-	@(chown 0 $(DESTDIR)$(bindir)/start_kdeinit && chmod 4755 \
$(DESTDIR)$(bindir)/start_kdeinit) || echo "Please make start_kdeinit setuid root" \
                >&2
-	@echo ""
-	@echo "start_kdeinit is by default installed on Linux with a set SETUID root bit!"
-	@echo "This is needed to prevent kdeinit from being killed by a bad heuristic in \
                the OOM-killer when running out of memory."
-	@echo ""
-endif
+	@if test \${KDEINIT_SETUID} != 0; then \
+		(chown 0 $(DESTDIR)$(bindir)/start_kdeinit && chmod 4755 \
$(DESTDIR)$(bindir)/start_kdeinit) || echo "Please make start_kdeinit setuid root" ; \
\ +	fi
 
 include $(top_srcdir)/admin/Doxyfile.am
--- branches/KDE/3.5/kdelibs/kinit/configure.in.in #599167:599168
@@ -49,10 +49,12 @@
 case $target_os in
     linux*)
         AC_MSG_RESULT(yes)
-        kdeinit_setuid=1
+        KDEINIT_SETUID=1
         AC_DEFINE(KDEINIT_OOM_PROTECT,1,[Enable prevention against poor Linux \
OOM-killer])  ;;
     *)  AC_MSG_RESULT(no)
+        KDEINIT_SETUID=0
         ;;
 esac
-AM_CONDITIONAL(KDEINIT_SETUID, test -n "$kdeinit_setuid" )
+AC_SUBST(KDEINIT_SETUID)
+AM_CONDITIONAL(KDEINIT_SETUID, test "$KDEINIT_SETUID" != 0 )


[prev in list] [next in list] [prev in thread] [next in thread]