DTD fix?

[Fyodor <fyodor () insecure org>]

So the current DTD ( http://www.insecure.org/nmap/data/nmap.dtd )
includes:

<!ATTLIST service
                        name            CDATA           #REQUIRED
                        conf            %service_confs; #REQUIRED
                        method          (table|detection|probed) #REQUIRED
                        version         CDATA           #IMPLIED
                        product         CDATA           #IMPLIED
                        extrainfo       CDATA           #IMPLIED
                        tunnel          (ssl)           #IMPLIED
                        proto           (rpc)           #IMPLIED
                        rpcnum          %attr_numeric;  #IMPLIED
                        lowver          %attr_numeric;  #IMPLIED
                        highver         %attr_numeric;  #IMPLIED
>


<!-- these elements are written by output.c: printosscanoutput() -->

                        hostname        CDATA           #IMPLIED
                        ostype          CDATA           #IMPLIED
                        devicetype      CDATA           #IMPLIED
<!ELEMENT os            ( portused* , osclass*, osmatch* ) >


Note how there is a right angle bracket after highver, then the
hostname, ostype, and devicetype appear after that.  That looks like a
mistake to me.  But since I don't fully understand the DTD format, I
thought I'd check with you guys before "fixing" it.  Unless someone
says it should be the way it is, I'm making the following change for
the next version of Nmap:

--- nmap.dtd    (revision 3224)
+++ nmap.dtd    (working copy)
@@ -166,14 +166,11 @@
                        rpcnum          %attr_numeric;  #IMPLIED
                        lowver          %attr_numeric;  #IMPLIED
                        highver         %attr_numeric;  #IMPLIED
->
-
-
-<!-- these elements are written by output.c: printosscanoutput() -->
-
                         hostname        CDATA           #IMPLIED
                         ostype          CDATA           #IMPLIED
                         devicetype      CDATA           #IMPLIED
+>
+
 <!ELEMENT os           ( portused* , osclass*, osmatch* ) >
 
 <!ELEMENT portused     EMPTY >


Cheers,
Fyodor


_______________________________________________
Sent through the nmap-dev mailing list
http://cgi.insecure.org/mailman/listinfo/nmap-dev