Reduced DNS lookups in check_ping and netutils.c in IPv6 configurations

[nagiosplug.git] / plugins / netutils.c

diff --git a/plugins/netutils.c b/plugins/netutils.c
index a3a241d254a81494d8259a33a97ecce851d139a5..9294f3a2101c33a9911f42b30893cd775bbaa578 100644 (file)
--- a/plugins/netutils.c
+++ b/plugins/netutils.c
@@ -324,14 +324,12 @@ int
 is_addr (const char *address)
 {
 #ifdef USE_IPV6
-       if (is_inet_addr (address) && address_family != AF_INET6)
+       if (address_family == AF_INET && is_inet_addr (address))
+               return TRUE;
+       else if (address_family == AF_INET6 && is_inet6_addr (address)) 
+               return TRUE;
 #else
        if (is_inet_addr (address))
-#endif
-               return (TRUE);
-
-#ifdef USE_IPV6
-       if (is_inet6_addr (address) && address_family != AF_INET)
                return (TRUE);
 #endif