From 8c82e5e3fe5e492a4efa9a95f1fe5ab3c91d93a6 Mon Sep 17 00:00:00 2001
From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Sun, 8 Jun 2014 02:49:50 +0000
Subject: [PATCH] New option --noscript turns off script scanning

I often need something like this when creating and testing new service
probes. It's handier than modifying script.db every time to remove
the "version" category.
---
 CHANGELOG |  3 +++
 NmapOps.h |  1 +
 nmap.cc   | 16 +++++++++++-----
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 39e80a81a..b85971ade 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o Added new option --noscript to turn off NSE. Useful to avoid running
+  version-category scripts during a quick -sV scan. [Daniel Miller]
+
 o [NSE] Add bacnet-info script to get device information from SCADA/ICS devices
   via BACnet (Building Automation and Control Networks) [Stephen Hilt, Michael
   Toecker]
diff --git a/NmapOps.h b/NmapOps.h
index 652bd3fac..89eb41d34 100644
--- a/NmapOps.h
+++ b/NmapOps.h
@@ -377,6 +377,7 @@ class NmapOps {
 
 #ifndef NOLUA
   int script;
+  bool noscript;
   char *scriptargs;
   char *scriptargsfile;
   int scriptversion;
diff --git a/nmap.cc b/nmap.cc
index febcca98d..ed493e68f 100644
--- a/nmap.cc
+++ b/nmap.cc
@@ -639,6 +639,7 @@ void parse_options(int argc, char **argv) {
     {"script_args_file", required_argument, 0, 0},
     {"script-help", required_argument, 0, 0},
     {"script_help", required_argument, 0, 0},
+    {"noscript", no_argument, 0, 0},
 #endif
     {"ip_options", required_argument, 0, 0},
     {"ip-options", required_argument, 0, 0},
@@ -676,6 +677,8 @@ void parse_options(int argc, char **argv) {
       } else if (optcmp(long_options[option_index].name, "script-help") == 0) {
         o.scripthelp = true;
         o.chooseScripts(optarg);
+      } else if (optcmp(long_options[option_index].name, "noscript") == 0) {
+        o.noscript = true;
       } else
 #endif
         if (optcmp(long_options[option_index].name, "max-os-tries") == 0) {
@@ -1440,6 +1443,9 @@ void  apply_delayed_options() {
   if (o.portlist && o.fastscan)
     fatal("You cannot use -F (fast scan) with -p (explicit port selection) but see --top-ports and --port-ratio to fast scan a range of ports");
 
+  if (o.noscript && o.script)
+    fatal("You have specified --noscript and explicitly enabled script scanning. Make up your mind");
+
   if (o.ipprotscan) {
     if (o.portlist)
       getpts(o.portlist, &ports);
@@ -1791,11 +1797,11 @@ int nmap_main(int argc, char *argv[]) {
   }
   if (o.servicescan)
     o.scriptversion = 1;
-  if (o.scriptversion || o.script || o.scriptupdatedb)
+  if (!o.noscript && (o.scriptversion || o.script || o.scriptupdatedb))
     open_nse();
 
   /* Run the script pre-scanning phase */
-  if (o.script) {
+  if (!o.noscript && o.script) {
     new_targets = NewTargets::get();
     script_scan_results = get_script_scan_results_obj();
     script_scan(Targets, SCRIPT_PRE_SCAN);
@@ -1822,7 +1828,7 @@ int nmap_main(int argc, char *argv[]) {
 
       if ((o.noportscan && !o.traceroute
 #ifndef NOLUA
-           && !o.script
+           && (!o.script || o.noscript)
 #endif
           ) || o.listscan) {
         /* We're done with the hosts */
@@ -1983,7 +1989,7 @@ int nmap_main(int argc, char *argv[]) {
       traceroute(Targets);
 
 #ifndef NOLUA
-    if (o.script || o.scriptversion) {
+    if (!o.noscript && (o.script || o.scriptversion)) {
       script_scan(Targets, SCRIPT_SCAN);
     }
 #endif
@@ -2042,7 +2048,7 @@ int nmap_main(int argc, char *argv[]) {
   } while (!o.max_ips_to_scan || o.max_ips_to_scan > o.numhosts_scanned);
 
 #ifndef NOLUA
-  if (o.script) {
+  if (!o.noscript && o.script) {
     script_scan(Targets, SCRIPT_POST_SCAN);
     printscriptresults(script_scan_results, SCRIPT_POST_SCAN);
     while (!script_scan_results->empty()) {