summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Nierlein <sven@nierlein.de>2020-05-15 09:46:54 (GMT)
committerSven Nierlein <sven@nierlein.de>2020-05-15 09:46:54 (GMT)
commit53e6f2970dcbabd41d55d87b2e7623a86fe48ec9 (patch)
tree766daf6602971dfc37e3e1d5f7483e35b98be5ff
parentadb958849491ea7e0bba4a15896ebd41a0fbff2d (diff)
parent4264e7a6edb651793ef751723537767656a89e44 (diff)
downloadmonitoring-plugins-53e6f2970dcbabd41d55d87b2e7623a86fe48ec9.tar.gz
Merge branch 'upstream' into check_curl
-rw-r--r--configure.ac8
-rw-r--r--doc/developer-guidelines.sgml4
-rw-r--r--plugins-root/check_dhcp.c3
3 files changed, 12 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 267c40a..4aebc2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1100,6 +1100,14 @@ then
1100 ac_cv_ping_packets_first=yes 1100 ac_cv_ping_packets_first=yes
1101 AC_MSG_RESULT([$with_ping_command]) 1101 AC_MSG_RESULT([$with_ping_command])
1102 1102
1103elif $PATH_TO_PING -4 -n -U -w 10 -c 1 127.0.0.1 2>/dev/null | \
1104 egrep -i "^round-trip|^rtt" >/dev/null
1105then
1106 # check if -4 is supported - issue #1550
1107 with_ping_command="$PATH_TO_PING -4 -n -U -w %d -c %d %s"
1108 ac_cv_ping_packets_first=yes
1109 ac_cv_ping_has_timeout=yes
1110 AC_MSG_RESULT([$with_ping_command])
1103elif $PATH_TO_PING -n -U -w 10 -c 1 127.0.0.1 2>/dev/null | \ 1111elif $PATH_TO_PING -n -U -w 10 -c 1 127.0.0.1 2>/dev/null | \
1104 egrep -i "^round-trip|^rtt" >/dev/null 1112 egrep -i "^round-trip|^rtt" >/dev/null
1105then 1113then
diff --git a/doc/developer-guidelines.sgml b/doc/developer-guidelines.sgml
index 5f480c5..6f31f36 100644
--- a/doc/developer-guidelines.sgml
+++ b/doc/developer-guidelines.sgml
@@ -324,8 +324,8 @@
324 </section> 324 </section>
325 325
326 <section><title>Performance data</title> 326 <section><title>Performance data</title>
327 <para>Nagios 3 and newer will concatenate the parts following a "|" in 327 <para>Nagios 3 and newer will concatenate the parts following a "|" in a) the first
328 each line of output by the plugin into a string it 328 line output by the plugin, and b) in the second to last line, into a string it
329 passes to whatever performance data processing it has configured. (Note that it 329 passes to whatever performance data processing it has configured. (Note that it
330 currently does not insert additional whitespace between both, so the plugin needs 330 currently does not insert additional whitespace between both, so the plugin needs
331 to provide some to prevent the last pair of a) and the first of b) getting run 331 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 f4c2daf..ad67323 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){
323#elif defined(__bsd__) 323#elif defined(__bsd__)
324 /* King 2004 see ACKNOWLEDGEMENTS */ 324 /* King 2004 see ACKNOWLEDGEMENTS */
325 325
326 int mib[6], len; 326 size_t len;
327 int mib[6];
327 char *buf; 328 char *buf;
328 unsigned char *ptr; 329 unsigned char *ptr;
329 struct if_msghdr *ifm; 330 struct if_msghdr *ifm;