PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-07 13:11:28 +00:00
Code Issues Projects Releases Wiki Activity

Revert r32979, superseded by script-intensity

Browse Source
This commit is contained in:
dmiller
2014-08-08 14:43:11 +00:00
parent a8d34b7635
commit a7a7229105
3 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@@ -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 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] 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 o [NSE] Add bacnet-info script to get device information from SCADA/ICS devices
via BACnet (Building Automation and Control Networks) [Stephen Hilt, Michael via BACnet (Building Automation and Control Networks) [Stephen Hilt, Michael
Toecker] Toecker]

1
NmapOps.h
View File

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

16
nmap.cc
View File

@@ -655,7 +655,6 @@ void parse_options(int argc, char **argv) {
{"script_args_file", required_argument, 0, 0}, {"script_args_file", required_argument, 0, 0},
{"script-help", required_argument, 0, 0}, {"script-help", required_argument, 0, 0},
{"script_help", required_argument, 0, 0}, {"script_help", required_argument, 0, 0},
{"noscript", no_argument, 0, 0},
#endif #endif
{"ip_options", required_argument, 0, 0}, {"ip_options", required_argument, 0, 0},
{"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) { } else if (optcmp(long_options[option_index].name, "script-help") == 0) {
o.scripthelp = true; o.scripthelp = true;
o.chooseScripts(optarg); o.chooseScripts(optarg);
} else if (optcmp(long_options[option_index].name, "noscript") == 0) {
o.noscript = true;
} else } else
#endif #endif
if (optcmp(long_options[option_index].name, "max-os-tries") == 0) { if (optcmp(long_options[option_index].name, "max-os-tries") == 0) {
@@ -1503,9 +1500,6 @@ void apply_delayed_options() {
if (o.portlist && o.fastscan) 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"); 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.ipprotscan) {
if (o.portlist) if (o.portlist)
getpts(o.portlist, &ports); getpts(o.portlist, &ports);
@@ -1869,11 +1863,11 @@ int nmap_main(int argc, char *argv[]) {
} }
if (o.servicescan) if (o.servicescan)
o.scriptversion = 1; o.scriptversion = 1;
if (!o.noscript && (o.scriptversion || o.script || o.scriptupdatedb)) if (o.scriptversion || o.script || o.scriptupdatedb)
open_nse(); open_nse();
/* Run the script pre-scanning phase */ /* Run the script pre-scanning phase */
if (!o.noscript && o.script) { if (o.script) {
new_targets = NewTargets::get(); new_targets = NewTargets::get();
script_scan_results = get_script_scan_results_obj(); script_scan_results = get_script_scan_results_obj();
script_scan(Targets, SCRIPT_PRE_SCAN); script_scan(Targets, SCRIPT_PRE_SCAN);
@@ -1900,7 +1894,7 @@ int nmap_main(int argc, char *argv[]) {
if ((o.noportscan && !o.traceroute if ((o.noportscan && !o.traceroute
#ifndef NOLUA #ifndef NOLUA
&& (!o.script || o.noscript) && !o.script
#endif #endif
) || o.listscan) { ) || o.listscan) {
/* We're done with the hosts */ /* We're done with the hosts */
@@ -2061,7 +2055,7 @@ int nmap_main(int argc, char *argv[]) {
traceroute(Targets); traceroute(Targets);
#ifndef NOLUA #ifndef NOLUA
if (!o.noscript && (o.script || o.scriptversion)) { if (o.script || o.scriptversion) {
script_scan(Targets, SCRIPT_SCAN); script_scan(Targets, SCRIPT_SCAN);
} }
#endif #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); } while (!o.max_ips_to_scan || o.max_ips_to_scan > o.numhosts_scanned);
#ifndef NOLUA #ifndef NOLUA
if (!o.noscript && o.script) { if (o.script) {
script_scan(Targets, SCRIPT_POST_SCAN); script_scan(Targets, SCRIPT_POST_SCAN);
printscriptresults(script_scan_results, SCRIPT_POST_SCAN); printscriptresults(script_scan_results, SCRIPT_POST_SCAN);
while (!script_scan_results->empty()) { while (!script_scan_results->empty()) {