mirror of
https://github.com/nmap/nmap.git
synced 2025-12-09 06:01:28 +00:00
Include service information in -oX and -oM even without -sV.
This is by Daniel Miller. http://seclists.org/nmap-dev/2012/q1/731
This commit is contained in:
@@ -1,5 +1,9 @@
|
|||||||
# Nmap Changelog ($Id$); -*-text-*-
|
# Nmap Changelog ($Id$); -*-text-*-
|
||||||
|
|
||||||
|
o Service-scan information is now included in XML and grepable output
|
||||||
|
even if -sV wasn't used. This information can be set by scripts in the
|
||||||
|
absence of -sV. [Daniel Miller]
|
||||||
|
|
||||||
o [NSE] Added the script dns-ip6-arpa-scan which uses a very efficient
|
o [NSE] Added the script dns-ip6-arpa-scan which uses a very efficient
|
||||||
technique to scan the ip6.arpa zone for PTR records. [Patrik Karlsson]
|
technique to scan the ip6.arpa zone for PTR records. [Patrik Karlsson]
|
||||||
|
|
||||||
|
|||||||
@@ -603,16 +603,10 @@ static int l_set_port_version (lua_State *L)
|
|||||||
else
|
else
|
||||||
luaL_error(L, "port.version 'cpe' field must be a table");
|
luaL_error(L, "port.version 'cpe' field must be a table");
|
||||||
|
|
||||||
if (o.servicescan)
|
target->ports.setServiceProbeResults(p->portno, p->proto,
|
||||||
target->ports.setServiceProbeResults(p->portno, p->proto,
|
probestate, name, tunnel, product,
|
||||||
probestate, name, tunnel, product,
|
version, extrainfo, hostname, ostype, devicetype,
|
||||||
version, extrainfo, hostname, ostype, devicetype,
|
(cpe.size() > 0) ? &cpe : NULL, NULL);
|
||||||
(cpe.size() > 0) ? &cpe : NULL, NULL);
|
|
||||||
else
|
|
||||||
target->ports.setServiceProbeResults(p->portno, p->proto,
|
|
||||||
probestate, name, tunnel, NULL, NULL,
|
|
||||||
NULL, NULL, NULL, NULL, NULL, NULL);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -739,7 +739,7 @@ void printportoutput(Target *currenths, PortList *plist) {
|
|||||||
Tbl->addItem(rowno, reasoncol, true, port_reason_str(current->reason));
|
Tbl->addItem(rowno, reasoncol, true, port_reason_str(current->reason));
|
||||||
|
|
||||||
sd.populateFullVersionString(fullversion, sizeof(fullversion));
|
sd.populateFullVersionString(fullversion, sizeof(fullversion));
|
||||||
if (*fullversion)
|
if (*fullversion && versioncol > 0)
|
||||||
Tbl->addItem(rowno, versioncol, true, fullversion);
|
Tbl->addItem(rowno, versioncol, true, fullversion);
|
||||||
|
|
||||||
// How should we escape illegal chars in grepable output?
|
// How should we escape illegal chars in grepable output?
|
||||||
|
|||||||
Reference in New Issue
Block a user