forked from pool/monitoring-plugins
29ea1b70d9
update to current git as of 20200520T233014.cadac85e changes summarized * detect unreachable dns service in nslookup output * check_curl: host_name may be null * update test parameter according to check_http * check_curl: use CURLOPT_RESOLVE to fix connecting to the right ip * workaround for issue #1550 - better use "ping -4" instead of "ping" if supported * Use size_t instead of int when calling sysctl(3) * check_tcp: add --sni * Fix timeout_interval declarations * check_curl: NSS, parse more date formats from certificate (in -C cert check) * check_curl: more tolerant CN= parsing when checking certificates (hit on Centos 8) * setting no_body to TRUE when we have a HEAD request * some LIBCURL_VERSION checks around HTTP/2 feature * added --http-version option to check_curl to choose HTTP * improved curlhelp_parse_statusline to handle both HTTP/1.x and HTTP/2 * check_curl: updates embedded picohttpparser to newest git version * setting progname of check_curl plugin to check_curl (at least for now) * Allow mariadbclient to be used for check_mysql * fix maxfd being zero * include -P switch in help * check_swap: repaired "-n" behaviour * improve command examples for 'at least' processes OBS-URL: https://build.opensuse.org/package/show/server:monitoring/monitoring-plugins?expand=0&rev=72
29 lines
1.3 KiB
Diff
29 lines
1.3 KiB
Diff
Index: monitoring-plugins-2.2/plugins-root/Makefile.am
|
|
===================================================================
|
|
--- monitoring-plugins-2.2.orig/plugins-root/Makefile.am
|
|
+++ monitoring-plugins-2.2/plugins-root/Makefile.am
|
|
@@ -47,7 +47,6 @@ INSTALL_SUID = \
|
|
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
|
|
@@ -66,11 +65,12 @@ install-exec-local: $(noinst_PROGRAMS)
|
|
&& 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); \
|
|
+ $(INSTALL_SUID); \
|
|
+ if test $$can_create_suid_root_executable != yes; then \
|
|
else \
|
|
- echo "WARNING: insufficient access; not installing setuid plugins"; \
|
|
+ echo "WARNING: insufficient access; not installing plugins as setuid"; \
|
|
echo "NOTE: to install setuid plugins, run 'make install-root' as root"; \
|
|
+ echo "NOTE: or fix this in your packaging (like the specfile)"; \
|
|
fi
|
|
|
|
# /* Author Coreutils team sub-citation */
|