PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-27 18:09:01 +00:00
Code Issues Projects Releases Wiki Activity

o The conditions for printing OS fingerprints to XML output are now

Browse Source 
the same as are used to decide whether to print them in the other
  formats. So they will be printed if submission is desirable,
  otherwise they are only printed if debuging is enabled or verbosity
  is 2 or higher. [Tom Sellers]
This commit is contained in:
fyodor
2009-02-01 21:08:39 +00:00
parent 046586774e
commit a8ff6858b4
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG
View File

@@ -1,5 +1,11 @@
# Nmap Changelog ($Id$); -*-text-*-
o The conditions for printing OS fingerprints to XML output are now
the same as are used to decide whether to print them in the other
formats. So they will be printed if submission is desirable,
otherwise they are only printed if debuging is enabled or verbosity
is 2 or higher. [Tom Sellers]
o Fix Ncat compilation with the MingW windows compiler. [Gisle Vanem]
Nmap 4.85BETA2 [2009-1-29]

13
output.cc
View File

@@ -1584,6 +1584,13 @@ static void write_merged_fpr(const FingerPrintResults *FPR,
bool isGoodFP, bool wrapit) {
log_write(LOG_NORMAL|LOG_SKID_NOXLT|LOG_STDOUT, "TCP/IP fingerprint:\n%s\n",
merge_fpr(FPR, currenths, isGoodFP, wrapit));
/* Added code here to print fingerprint to XML file any time it would be printed
to any other output format */
char *xml_osfp = xml_convert(merge_fpr(FPR, currenths, isGoodFP, wrapit));
log_write(LOG_XML,"<osfingerprint fingerprint=\"%s\" />\n", xml_osfp);
free(xml_osfp);
}
/* Prints the formatted OS Scan output to stdout, logfiles, etc (but only
@@ -1706,12 +1713,6 @@ void printosscanoutput(Target *currenths) {
assert(0);
}
if (o.debugging || o.verbose) {
char *xml_osfp = xml_convert(merge_fpr(FPR, currenths, reason != NULL, reason != NULL));
log_write(LOG_XML,"<osfingerprint fingerprint=\"%s\" />\n", xml_osfp);
free(xml_osfp);
}
log_write(LOG_XML, "</os>\n");
if (currenths->seq.lastboot) {