Ruediger Oertel 2020-09-14 12:35:19 +00:00 committed by Git OBS Bridge
parent efb03752f8
commit da7df117d7

View File

@ -10,7 +10,7 @@ Index: monitoring-plugins-2.2/plugins-root/Makefile.am
echo " chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p"; \ echo " chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p"; \
chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p; \ chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p; \
done done
@@ -66,11 +65,12 @@ install-exec-local: $(noinst_PROGRAMS) @@ -66,11 +65,11 @@ install-exec-local: $(noinst_PROGRAMS)
&& chmod $(setuid_root_mode) $$TMPFILE > /dev/null 2>&1 \ && chmod $(setuid_root_mode) $$TMPFILE > /dev/null 2>&1 \
&& can_create_suid_root_executable=yes; \ && can_create_suid_root_executable=yes; \
rm -f $$TMPFILE; \ rm -f $$TMPFILE; \
@ -18,7 +18,7 @@ Index: monitoring-plugins-2.2/plugins-root/Makefile.am
- $(INSTALL_SUID); \ - $(INSTALL_SUID); \
+ $(INSTALL_SUID); \ + $(INSTALL_SUID); \
+ if test $$can_create_suid_root_executable != yes; then \ + if test $$can_create_suid_root_executable != yes; then \
else \ - else \
- echo "WARNING: insufficient access; not installing setuid plugins"; \ - echo "WARNING: insufficient access; not installing setuid plugins"; \
+ echo "WARNING: insufficient access; not installing plugins as setuid"; \ + echo "WARNING: insufficient access; not installing plugins as setuid"; \
echo "NOTE: to install setuid plugins, run 'make install-root' as root"; \ echo "NOTE: to install setuid plugins, run 'make install-root' as root"; \