summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Weiss <holger@zedat.fu-berlin.de>2012-06-24 23:14:12 (GMT)
committerHolger Weiss <holger@zedat.fu-berlin.de>2012-06-24 23:14:12 (GMT)
commitbf7c4f95aea64e784c66c7ee27da5259ce07f4e1 (patch)
tree01085159faf8adc60bb9b87ae9ad7f80918ef8b7
parent991054fa6e3d8b3288679ebfe6d84bcfe3ca5d20 (diff)
parentc69890a4b4e3b303ae82cc7eec773486e08c80bb (diff)
downloadmonitoring-plugins-bf7c4f95aea64e784c66c7ee27da5259ce07f4e1.tar.gz
Merge remote-tracking branch 'github/waja/master'
Conflicts: NEWS
-rw-r--r--NEWS4
-rw-r--r--plugins/check_ping.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 29ca455..2ccc65d 100644
--- a/NEWS
+++ b/NEWS
@@ -18,13 +18,13 @@ This file documents the major additions and syntax changes between releases.
18 18
19 FIXES 19 FIXES
20 Fix check_disk free space calculation if blocksizes differ within a disk group (Bekar - #2973603) 20 Fix check_disk free space calculation if blocksizes differ within a disk group (Bekar - #2973603)
21 check_disk_smb now handles NT_STATUS_ACCESS_DENIED properly (Debian #601696) 21 check_disk_smb now handles NT_STATUS_ACCESS_DENIED properly (Debian #601696)
22 Make check_snmp work more like v1.4.14 with regard to using special values (Timeticks, STRING) as numeric thresholds 22 Make check_snmp work more like v1.4.14 with regard to using special values (Timeticks, STRING) as numeric thresholds
23 Fix check_ldap overriding the port when --ssl was specified after -p 23 Fix check_ldap overriding the port when --ssl was specified after -p
24 Fix check_procs where regex input of '|' would get displayed in output - now replaced with ',' 24 Fix check_procs where regex input of '|' would get displayed in output - now replaced with ','
25 Fix segfault in check_host when hostname returns multiple IP addresses (Sebastian Harl) 25 Fix segfault in check_host when hostname returns multiple IP addresses (Sebastian Harl)
26 Fix check_smtp and check_tcp where duplicate messages were displayed for certificate errors 26 Fix check_smtp and check_tcp where duplicate messages were displayed for certificate errors
27 Fix check_ping's parsing of the output of Debian's ping6(1) implementation (#1894850 - Matej Vela) 27 Fix check_ping's parsing of ping6(1) output (#1894850, Debian #514588, Debian #662638 - Matej Vela)
28 Fix a check_dhcp bug which was triggered by using it to check Windows 2003 DHCP servers (#3503921) 28 Fix a check_dhcp bug which was triggered by using it to check Windows 2003 DHCP servers (#3503921)
29 Disable RFC4507 support, to work around SSL negotiation issues with (at least) some Tomcat versions 29 Disable RFC4507 support, to work around SSL negotiation issues with (at least) some Tomcat versions
30 30
diff --git a/plugins/check_ping.c b/plugins/check_ping.c
index bfdee49..23dcd6a 100644
--- a/plugins/check_ping.c
+++ b/plugins/check_ping.c
@@ -533,6 +533,8 @@ error_scan (char buf[MAX_INPUT_BUFFER], const char *addr)
533 die (STATE_CRITICAL, _("CRITICAL - Host not found (%s)"), addr); 533 die (STATE_CRITICAL, _("CRITICAL - Host not found (%s)"), addr);
534 else if (strstr (buf, "Time to live exceeded")) 534 else if (strstr (buf, "Time to live exceeded"))
535 die (STATE_CRITICAL, _("CRITICAL - Time to live exceeded (%s)"), addr); 535 die (STATE_CRITICAL, _("CRITICAL - Time to live exceeded (%s)"), addr);
536 else if (strstr (buf, "Destination unreachable: "))
537 die (STATE_CRITICAL, _("CRITICAL - Destination Unreachable (%s)"), addr);
536 538
537 if (strstr (buf, "(DUP!)") || strstr (buf, "DUPLICATES FOUND")) { 539 if (strstr (buf, "(DUP!)") || strstr (buf, "DUPLICATES FOUND")) {
538 if (warn_text == NULL) 540 if (warn_text == NULL)