Merge remote-tracking branch 'github/waja/master'

Conflicts:
	NEWS

2 files changed, 4 insertions, 2 deletions

diff --git a/NEWS b/NEWS
index 29ca455f..2ccc65d1 100644
--- a/NEWS
+++ b/NEWS
@@ -18,13 +18,13 @@ This file documents the major additions and syntax changes between releases.
 
         FIXES
         Fix check_disk free space calculation if blocksizes differ within a disk group (Bekar - #2973603)
-        check_disk_smb now handles NT_STATUS_ACCESS_DENIED properly (Debian #601696) 
+        check_disk_smb now handles NT_STATUS_ACCESS_DENIED properly (Debian #601696)
         Make check_snmp work more like v1.4.14 with regard to using special values (Timeticks, STRING) as numeric thresholds
         Fix check_ldap overriding the port when --ssl was specified after -p
         Fix check_procs where regex input of '|' would get displayed in output - now replaced with ','
         Fix segfault in check_host when hostname returns multiple IP addresses (Sebastian Harl)
         Fix check_smtp and check_tcp where duplicate messages were displayed for certificate errors
-        Fix check_ping's parsing of the output of Debian's ping6(1) implementation (#1894850 - Matej Vela)
+        Fix check_ping's parsing of ping6(1) output (#1894850, Debian #514588, Debian #662638 - Matej Vela)
         Fix a check_dhcp bug which was triggered by using it to check Windows 2003 DHCP servers (#3503921)
         Disable RFC4507 support, to work around SSL negotiation issues with (at least) some Tomcat versions
 
diff --git a/plugins/check_ping.c b/plugins/check_ping.c
index bfdee492..23dcd6a8 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)
                 die (STATE_CRITICAL, _("CRITICAL - Host not found (%s)"), addr);
         else if (strstr (buf, "Time to live exceeded"))
                 die (STATE_CRITICAL, _("CRITICAL - Time to live exceeded (%s)"), addr);
+        else if (strstr (buf, "Destination unreachable: "))
+                die (STATE_CRITICAL, _("CRITICAL - Destination Unreachable (%s)"), addr);
 
         if (strstr (buf, "(DUP!)") || strstr (buf, "DUPLICATES FOUND")) {
                 if (warn_text == NULL)