diff options
| author |  Sven Nierlein <sven@nierlein.de>
| 2020-05-15 11:46:54 +0200 |
|---|---|---|
| committer | Sven Nierlein <sven@nierlein.de>
| 2020-05-15 11:46:54 +0200 |
| commit | 53e6f2970dcbabd41d55d87b2e7623a86fe48ec9 (patch) | |
| tree | 766daf6602971dfc37e3e1d5f7483e35b98be5ff | |
| parent | adb958849491ea7e0bba4a15896ebd41a0fbff2d (diff) | |
| parent | 4264e7a6edb651793ef751723537767656a89e44 (diff) | |
| download | monitoring-plugins-53e6f2970dcbabd41d55d87b2e7623a86fe48ec9.tar.gz | |
Merge branch 'upstream' into check_curl
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | doc/developer-guidelines.sgml | 4 | ||||
| -rw-r--r-- | plugins-root/check_dhcp.c | 3 |
3 files changed, 12 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 267c40a2..4aebc2ad 100644 --- a/configure.ac +++ b/configure.ac @@ -1100,6 +1100,14 @@ then ac_cv_ping_packets_first=yes AC_MSG_RESULT([$with_ping_command]) +elif $PATH_TO_PING -4 -n -U -w 10 -c 1 127.0.0.1 2>/dev/null | \ + egrep -i "^round-trip|^rtt" >/dev/null +then + # check if -4 is supported - issue #1550 + with_ping_command="$PATH_TO_PING -4 -n -U -w %d -c %d %s" + ac_cv_ping_packets_first=yes + ac_cv_ping_has_timeout=yes + AC_MSG_RESULT([$with_ping_command]) elif $PATH_TO_PING -n -U -w 10 -c 1 127.0.0.1 2>/dev/null | \ egrep -i "^round-trip|^rtt" >/dev/null then diff --git a/doc/developer-guidelines.sgml b/doc/developer-guidelines.sgml index 5f480c5f..6f31f365 100644 --- a/doc/developer-guidelines.sgml +++ b/doc/developer-guidelines.sgml @@ -324,8 +324,8 @@ </section> <section><title>Performance data</title> - <para>Nagios 3 and newer will concatenate the parts following a "|" in - each line of output by the plugin into a string it + <para>Nagios 3 and newer will concatenate the parts following a "|" in a) the first + line output by the plugin, and b) in the second to last line, into a string it passes to whatever performance data processing it has configured. (Note that it currently does not insert additional whitespace between both, so the plugin needs to provide some to prevent the last pair of a) and the first of b) getting run diff --git a/plugins-root/check_dhcp.c b/plugins-root/check_dhcp.c index f4c2dafd..ad673237 100644 --- a/plugins-root/check_dhcp.c +++ b/plugins-root/check_dhcp.c @@ -323,7 +323,8 @@ int get_hardware_address(int sock,char *interface_name){ #elif defined(__bsd__) /* King 2004 see ACKNOWLEDGEMENTS */ - int mib[6], len; + size_t len; + int mib[6]; char *buf; unsigned char *ptr; struct if_msghdr *ifm; |