diff -ruN nagios-plugins-1.4.5.orig/plugins-root/Makefile.am nagios-plugins-1.4.5/plugins-root/Makefile.am --- nagios-plugins-1.4.5.orig/plugins-root/Makefile.am 2006-10-24 20:48:26 +1100 +++ nagios-plugins-1.4.5/plugins-root/Makefile.am 2006-11-30 02:32:00 +1000 @@ -35,32 +35,13 @@ p=$$f; \ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p"; \ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p; \ - echo " chown root $(DESTDIR)$(libexecdir)/$$p"; \ - chown root $(DESTDIR)$(libexecdir)/$$p; \ - echo " chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p"; \ - chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p; \ done install-root: $(noinst_PROGRAMS) @$(INSTALL_SUID) install-exec-local: $(noinst_PROGRAMS) - @TMPFILE=$(DESTDIR)$(libexecdir)/.setuid-$$$$; \ - rm -f $$TMPFILE; \ - echo > $$TMPFILE; \ - ## See if we can create a setuid root executable in $(libexecdir). - ## If not, then don't even try to install setuid plugins. - can_create_suid_root_executable=no; \ - chown root $$TMPFILE > /dev/null 2>&1 \ - && chmod $(setuid_root_mode) $$TMPFILE > /dev/null 2>&1 \ - && can_create_suid_root_executable=yes; \ - rm -f $$TMPFILE; \ - if test $$can_create_suid_root_executable = yes; then \ - $(INSTALL_SUID); \ - else \ - echo "WARNING: insufficient access; not installing setuid plugins"; \ - echo "NOTE: to install setuid plugins, run 'make install-root' as root"; \ - fi + @$(INSTALL_SUID) # /* Author Coreutils team sub-citation */ diff -ruN nagios-plugins-1.4.5.orig/plugins-root/Makefile.in nagios-plugins-1.4.5/plugins-root/Makefile.in --- nagios-plugins-1.4.5.orig/plugins-root/Makefile.in 2006-11-02 07:23:57 +1000 +++ nagios-plugins-1.4.5/plugins-root/Makefile.in 2006-11-30 02:32:53 +1000 @@ -290,10 +290,6 @@ p=$$f; \ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p"; \ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p; \ - echo " chown root $(DESTDIR)$(libexecdir)/$$p"; \ - chown root $(DESTDIR)$(libexecdir)/$$p; \ - echo " chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p"; \ - chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p; \ done @@ -646,20 +642,7 @@ @$(INSTALL_SUID) install-exec-local: $(noinst_PROGRAMS) - @TMPFILE=$(DESTDIR)$(libexecdir)/.setuid-$$$$; \ - rm -f $$TMPFILE; \ - echo > $$TMPFILE; \ - can_create_suid_root_executable=no; \ - chown root $$TMPFILE > /dev/null 2>&1 \ - && chmod $(setuid_root_mode) $$TMPFILE > /dev/null 2>&1 \ - && can_create_suid_root_executable=yes; \ - rm -f $$TMPFILE; \ - if test $$can_create_suid_root_executable = yes; then \ - $(INSTALL_SUID); \ - else \ - echo "WARNING: insufficient access; not installing setuid plugins"; \ - echo "NOTE: to install setuid plugins, run 'make install-root' as root"; \ - fi + @$(INSTALL_SUID) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: