[Nagiosplug-checkins] nagiosplug/plugins-root Makefile.am,1.7,1.8

[Ton Voon]

Update of /cvsroot/nagiosplug/nagiosplug/plugins-root
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv27352/plugins-root

Modified Files:
	Makefile.am 
Log Message:
Do not install setuid programs unless run as root


Index: Makefile.am
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins-root/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile.am	7 Jun 2006 07:18:12 -0000	1.7
+++ Makefile.am	7 Jun 2006 07:59:32 -0000	1.8
@@ -9,7 +9,7 @@
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 LIBS = @LIBINTL@ @LIBS@ @SSLLIBS@
 
-libexec_PROGRAMS = check_dhcp check_icmp @EXTRAS_ROOT@
+noinst_PROGRAMS = check_dhcp check_icmp @EXTRAS_ROOT@
 
 EXTRA_PROGRAMS = pst3
 
@@ -28,12 +28,10 @@
 
 setuid_root_mode = 4550
 
-group = nagios
-
 # /* Author Coreutils team - see ACKNOWLEDGEMENTS */
 
 INSTALL_SUID = \
-	for f in $(libexec_PROGRAMS) ; do \
+	for f in $(noinst_PROGRAMS) ; do \
 	p=$$f; \
 	echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p"; \
 	$(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p; \
@@ -43,10 +41,10 @@
 	chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p; \
 	done
 
-install-root: $(libexec_PROGRAMS)
+install-root: $(noinst_PROGRAMS)
 	@$(INSTALL_SUID)
 
-install-exec-local: $(libexec_PROGRAMS)
+install-exec-local: $(noinst_PROGRAMS)
 	@TMPFILE=$(DESTDIR)$(libexecdir)/.setuid-$$$$; \
 	rm -f $$TMPFILE; \
 	echo > $$TMPFILE; \