From 719d9c94425e657f34e8315189855807c2a20a27 Mon Sep 17 00:00:00 2001
From: david <david@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Sat, 24 Oct 2009 01:01:08 +0000
Subject: [PATCH] Add the user's specified host name to XML output, if
 available. It looks like this:

<hostnames>
<hostname name="openbsd.org" type="user"/>
<hostname name="cvs.openbsd.org" type="PTR"/>
</hostnames>
---
 docs/nmap.dtd |  2 +-
 output.cc     | 27 +++++++++++++++------------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/docs/nmap.dtd b/docs/nmap.dtd
index 91e851522..93e3a5367 100644
--- a/docs/nmap.dtd
+++ b/docs/nmap.dtd
@@ -55,7 +55,7 @@
 <!-- don't know how to escape states like open|filtered -->
 <!ENTITY % port_states "CDATA" >
 
-<!ENTITY % hostname_types "(PTR)" >
+<!ENTITY % hostname_types "(user|PTR)" >
 
 <!-- see output.c:output_xml_scaninfo_records for scan types -->
 <!ENTITY % scan_types "(syn|ack|bounce|connect|null|xmas|window|maimon|fin|udp|sctpinit|sctpcookieecho|ipproto)" >
diff --git a/output.cc b/output.cc
index 9962a7ac5..6cc23615b 100644
--- a/output.cc
+++ b/output.cc
@@ -1378,23 +1378,26 @@ static void print_MAC_XML_Info(Target * currenths) {
 
 /* Helper function to write the status and address/hostname info of a host
    into the XML log */
-static void write_xml_initial_hostinfo(Target * currenths,
+static void write_xml_initial_hostinfo(Target *currenths,
                                        const char *status) {
   log_write(LOG_XML, "<status state=\"%s\" reason=\"%s\"/>\n", status,
             reason_str(currenths->reason.reason_id, SINGULAR));
   log_write(LOG_XML, "<address addr=\"%s\" addrtype=\"%s\" />\n",
-            currenths->targetipstr(),
-            (o.af() == AF_INET) ? "ipv4" : "ipv6");
+            currenths->targetipstr(), (o.af() == AF_INET) ? "ipv4" : "ipv6");
   print_MAC_XML_Info(currenths);
-  if (*currenths->HostName()) {
-    log_write(LOG_XML,
-              "<hostnames><hostname name=\"%s\" type=\"PTR\" /></hostnames>\n",
-              currenths->HostName());
-  } else {
-    /* If machine is up, put blank hostname so front ends know that no name
-       resolution is forthcoming */
-    if (strcmp(status, "up") == 0)
-      log_write(LOG_XML, "<hostnames />\n");
+  /* Output a hostnames element whenever we have a name to write or the target
+     is up. */
+  if (currenths->TargetName() != NULL || *currenths->HostName() || strcmp(status, "up") == 0) {
+    log_write(LOG_XML, "<hostnames>\n");
+    if (currenths->TargetName() != NULL) {
+      log_write(LOG_XML, "<hostname name=\"%s\" type=\"user\"/>\n",
+                currenths->TargetName());
+    }
+    if (*currenths->HostName()) {
+      log_write(LOG_XML, "<hostname name=\"%s\" type=\"PTR\"/>\n",
+                currenths->HostName());
+    }
+    log_write(LOG_XML, "</hostnames>\n");
   }
   log_flush_all();
 }