CERBERUS/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-05-13 08:46:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Delay processing of -A until all --un/privileged options have been seen

Browse source
This commit is contained in:
dmiller 2016-09-01 03:34:23 +00:00
parent 2c6666cb34
commit 5cfc7e8564
1 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
nmap.cc
View file

@ -500,6 +500,7 @@ public:
this->pre_max_retries = -1;
this->pre_host_timeout = -1;
this->iflist = false;
this->advanced = false;
this->af = AF_UNSPEC;
this->decoys = false;
}
@ -513,7 +514,7 @@ public:
int pre_max_retries;
long pre_host_timeout;
char *machinefilename, *kiddiefilename, *normalfilename, *xmlfilename;
bool iflist, decoys;
bool iflist, decoys, advanced;
char *exclude_spec, *exclude_file;
char *spoofSource, *decoy_arguments;
const char *spoofmac;
@ -1057,14 +1058,7 @@ void parse_options(int argc, char **argv) {
#endif /* !HAVE_IPV6 */
break;
case 'A':
o.servicescan = true;
#ifndef NOLUA
o.script = 1;
#endif
if (o.isr00t) {
o.osscan++;
o.traceroute = true;
}
delayed_options.advanced = true;
break;
case 'b':
o.bouncescan++;
@ -1437,6 +1431,16 @@ void apply_delayed_options() {
}
delayed_options.verbose_out.clear();
if (delayed_options.advanced) {
o.servicescan = true;
#ifndef NOLUA
o.script = 1;
#endif
if (o.isr00t) {
o.osscan++;
o.traceroute = true;
}
}
if (o.spoofsource) {
int rc = resolve(delayed_options.spoofSource, 0, &ss, &sslen, o.af());
if (rc != 0) {