PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-15 12:19:02 +00:00
Code Issues Projects Releases Wiki Activity

Fixed a bug which prevented the --without-liblua compilation option from working. Thanks to Kris Katterjohn for the patch.

Browse Source
This commit is contained in:
fyodor
2007-01-03 20:46:14 +00:00
parent 47036bc063
commit 84340f5737
3 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@@ -21,6 +21,9 @@ o Fix nmap.xsl (the transform for rendering Nmap XML results as HTML)
to fix some bugs related to OS detection output. Thanks to Tom to fix some bugs related to OS detection output. Thanks to Tom
Sellers for the patch. Sellers for the patch.
o Fixed a bug which prevented the --without-liblua compilation option
from working. Thanks to Kris Katterjohn for the patch.
o Applied a bunch of code cleanup patches from Kris Katterjohn. o Applied a bunch of code cleanup patches from Kris Katterjohn.
o Applied some internal bugfix patches from Eddie Bell. o Applied some internal bugfix patches from Eddie Bell.

8
nmap.cc
View File

@@ -738,7 +738,9 @@ int nmap_main(int argc, char *argv[]) {
o.osscan_guess = 1; o.osscan_guess = 1;
} else if (optcmp(long_options[option_index].name, "packet-trace") == 0) { } else if (optcmp(long_options[option_index].name, "packet-trace") == 0) {
o.setPacketTrace(true); o.setPacketTrace(true);
#ifndef NOLUA
o.scripttrace = 1; o.scripttrace = 1;
#endif
} else if (optcmp(long_options[option_index].name, "version-trace") == 0) { } else if (optcmp(long_options[option_index].name, "version-trace") == 0) {
o.setVersionTrace(true); o.setVersionTrace(true);
o.debugging++; o.debugging++;
@@ -832,7 +834,9 @@ int nmap_main(int argc, char *argv[]) {
break; break;
case 'A': case 'A':
o.servicescan = true; o.servicescan = true;
#ifndef NOLUA
o.script = 1; o.script = 1;
#endif
if (o.isr00t) if (o.isr00t)
o.osscan = OS_SCAN_DEFAULT; o.osscan = OS_SCAN_DEFAULT;
break; break;
@@ -1435,11 +1439,13 @@ int nmap_main(int argc, char *argv[]) {
// if (num_host_exp_groups == 0) // if (num_host_exp_groups == 0)
// fatal("No target machines/networks specified!"); // fatal("No target machines/networks specified!");
#ifndef NOLUA
if(o.scriptupdatedb) { if(o.scriptupdatedb) {
script_updatedb(); script_updatedb();
// disable warnings // disable warnings
o.max_ips_to_scan = o.numhosts_scanned; o.max_ips_to_scan = o.numhosts_scanned;
} }
#endif
hstate = new HostGroupState(o.ping_group_sz, o.randomize_hosts, hstate = new HostGroupState(o.ping_group_sz, o.randomize_hosts,
host_exp_group, num_host_exp_groups); host_exp_group, num_host_exp_groups);
@@ -1604,7 +1610,9 @@ int nmap_main(int argc, char *argv[]) {
if (o.servicescan) { if (o.servicescan) {
o.current_scantype = SERVICE_SCAN; o.current_scantype = SERVICE_SCAN;
#ifndef NOLUA
o.scriptversion = 1; o.scriptversion = 1;
#endif
keyWasPressed(); // Check if a status message should be printed keyWasPressed(); // Check if a status message should be printed
service_scan(Targets); service_scan(Targets);

6
output.cc
View File

@@ -1691,7 +1691,11 @@ void printfinaloutput() {
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);
timep = time(NULL); timep = time(NULL);
if (o.numhosts_scanned == 0 && o.scriptupdatedb == 0) if (o.numhosts_scanned == 0
#ifndef NOLUA
&& o.scriptupdatedb == 0
#endif
)
fprintf(stderr, "WARNING: No targets were specified, so 0 hosts scanned.\n"); fprintf(stderr, "WARNING: No targets were specified, so 0 hosts scanned.\n");
if (o.numhosts_scanned == 1 && o.numhosts_up == 0 && !o.listscan && if (o.numhosts_scanned == 1 && o.numhosts_up == 0 && !o.listscan &&
o.pingtype != PINGTYPE_NONE) o.pingtype != PINGTYPE_NONE)