From ede6b224f53bdc97bf839637ce1a078ba0b8a699 Mon Sep 17 00:00:00 2001 From: david Date: Wed, 24 Mar 2010 01:12:58 +0000 Subject: [PATCH] Make it a fatal error if you try to combine traceroute with idle or connect scan, IPv6, or non-root. Previously it only printed a warning and disabled traceroute, which was easy to miss until the scan finished. --- nmap.cc | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/nmap.cc b/nmap.cc index 4c2b63d1b..21e9db88a 100644 --- a/nmap.cc +++ b/nmap.cc @@ -1416,20 +1416,13 @@ int nmap_main(int argc, char *argv[]) { } #if HAVE_IPV6 - if(o.af() == AF_INET6 && o.traceroute) { - error("Warning: Traceroute does not support IPv6, disabling..."); - o.traceroute = 0; - } else + if(o.af() == AF_INET6 && o.traceroute) + fatal("Traceroute does not support IPv6"); #endif - if(o.traceroute && (o.idlescan || o.connectscan)) { - error("Warning: Traceroute does not support idle or connect scan, disabling..."); - o.traceroute = 0; - } - - if(o.traceroute && !o.isr00t) { - error("Warning: Traceroute has to be run as root, disabling..."); - o.traceroute = 0; - } + if (o.traceroute && !o.isr00t) + fatal("Traceroute has to be run as root"); + if (o.traceroute && (o.idlescan || o.connectscan)) + fatal("Traceroute does not support idle or connect scan"); if ((o.noportscan) && (portlist || o.fastscan))