From d2a8535ebc66df6efa56ea7d3d972ca7c0d61182 Mon Sep 17 00:00:00 2001
From: kris <kris@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Wed, 14 May 2008 16:55:09 +0000
Subject: [PATCH] Fixing r7470 (patch for ICMP ping + IPv6)--it stopped every
 IPv6 scan

---
 NmapOps.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NmapOps.cc b/NmapOps.cc
index f3214c7cf..45e1d11f7 100644
--- a/NmapOps.cc
+++ b/NmapOps.cc
@@ -376,7 +376,7 @@ void NmapOps::ValidateOptions() {
    fatal("Ping scan is not valid with any other scan types (the other ones all include a ping scan");
  }
 
- if (af() == AF_INET6 && (PINGTYPE_ICMP_PING || PINGTYPE_ICMP_MASK || PINGTYPE_ICMP_TS)) {
+ if (af() == AF_INET6 && (pingtype & (PINGTYPE_ICMP_PING|PINGTYPE_ICMP_MASK|PINGTYPE_ICMP_TS))) {
    fatal("ICMP Echo, Timestamp and Address Mask pings are only valid for IPv4.");
  }