Revert r32979, superseded by script-intensity

CHANGELOG

@@ -25,9 +25,6 @@ o Updated the bundled libpcap from 1.2.1 to 1.5.3 [Jay Bosamiya]
 o Correct the Target MAC Address in Nmap's ARP discovery to conform to what IP
   stacks in currently popular operating systems use. [Jay Bosamiya]
 
-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]

NmapOps.h

@@ -379,7 +379,6 @@ class NmapOps {
 
 #ifndef NOLUA
   int script;
-  bool noscript;
   char *scriptargs;
   char *scriptargsfile;
   int scriptversion;

nmap.cc

@@ -269,7 +269,7 @@ static void printusage(int rc) {
 #ifndef NOLUA
          "SCRIPT SCAN:\n"
          "  -sC: equivalent to --script=default\n"
-         "  --script=<Lua scripts>: <Lua scripts> is a comma separated list of \n"
+         "  --script=<Lua scripts>: <Lua scripts> is a comma separated list of\n"
          "           directories, script-files or script-categories\n"
          "  --script-args=<n1=v1,[n2=v2,...]>: provide arguments to scripts\n"
          "  --script-args-file=filename: provide NSE script args in a file\n"
@@ -655,7 +655,6 @@ 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},
@@ -693,8 +692,6 @@ 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) {
@@ -1503,9 +1500,6 @@ 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);
@@ -1869,11 +1863,11 @@ int nmap_main(int argc, char *argv[]) {
   }
   if (o.servicescan)
     o.scriptversion = 1;
-  if (!o.noscript && (o.scriptversion || o.script || o.scriptupdatedb))
+  if (o.scriptversion || o.script || o.scriptupdatedb)
     open_nse();
 
   /* Run the script pre-scanning phase */
-  if (!o.noscript && o.script) {
+  if (o.script) {
     new_targets = NewTargets::get();
     script_scan_results = get_script_scan_results_obj();
     script_scan(Targets, SCRIPT_PRE_SCAN);
@@ -1900,7 +1894,7 @@ int nmap_main(int argc, char *argv[]) {
 
       if ((o.noportscan && !o.traceroute
 #ifndef NOLUA
-           && (!o.script || o.noscript)
+           && !o.script
 #endif
           ) || o.listscan) {
         /* We're done with the hosts */
@@ -2061,7 +2055,7 @@ int nmap_main(int argc, char *argv[]) {
       traceroute(Targets);
 
 #ifndef NOLUA
-    if (!o.noscript && (o.script || o.scriptversion)) {
+    if (o.script || o.scriptversion) {
       script_scan(Targets, SCRIPT_SCAN);
     }
 #endif
@@ -2120,7 +2114,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.noscript && o.script) {
+  if (o.script) {
     script_scan(Targets, SCRIPT_POST_SCAN);
     printscriptresults(script_scan_results, SCRIPT_POST_SCAN);
     while (!script_scan_results->empty()) {