ftp_banners.xml in recog-1.0.4

- old
+ new

@@ -266,11 +266,11 @@
     <param pos="0" name="os.vendor" value="APC"/>
     <param pos="0" name="os.device" value="Power device"/>
     <param pos="1" name="os.product"/>
     <param pos="2" name="os.version"/>
   </fingerprint>
-  <fingerprint pattern="^(\S+) FTP server \(EMC-SNAS: ([^\)]+)\)(:? \S+)?$">
+  <fingerprint pattern="^(\S+) FTP server \(EMC-SNAS: ([^\)]+)\)(?: \S+)?$">
     <example>foo2 FTP server (EMC-SNAS: 5.6.47.11)</example>
     <example>foo2 FTP server (EMC-SNAS: 5.6.50.203) ready.</example>
     <example>foo4 FTP server (EMC-SNAS: 5.5.31.6) r</example>
     <description>EMC Celerra</description>
     <param pos="0" name="service.vendor" value="EMC"/>
@@ -302,10 +302,11 @@
     <param pos="0" name="service.family" value="Firewall-1"/>
     <param pos="0" name="os.vendor" value="Check Point"/>
     <param pos="0" name="os.device" value="Firewall"/>
     <param pos="0" name="os.family" value="Firewall-1"/>
     <param pos="0" name="os.product" value="Firewall-1"/>
+    <param pos="1" name="host.name"/>
   </fingerprint>
   <fingerprint pattern="^Blue Coat FTP Service$">
     <example>Blue Coat FTP Service</example>
     <description>Blue Coat security appliances</description>
     <param pos="0" name="service.vendor" value="Blue Coat"/>
@@ -353,10 +354,11 @@
     <example>hostname DCS-2100 FTP server ready.</example>
     <description>D-Link DCS-2100 wireless internet camera</description>
     <param pos="0" name="os.vendor" value="D-Link"/>
     <param pos="0" name="os.product" value="DCS-2100"/>
     <param pos="0" name="os.device" value="Web cam"/>
+    <param pos="1" name="host.name"/>
   </fingerprint>
   <fingerprint pattern="^Secure Gateway FTP server ready\.$">
     <example>Secure Gateway FTP server ready.</example>
     <description>Raptor firewall</description>
     <param pos="0" name="os.vendor" value="Symantec"/>
@@ -370,12 +372,12 @@
     <param pos="0" name="os.vendor" value="Sun"/>
     <param pos="0" name="os.family" value="StorEdge"/>
     <param pos="1" name="os.product"/>
     <param pos="0" name="os.device" value="Storage"/>
   </fingerprint>
-  <fingerprint pattern="^AXIS (\S+) (?:Network( Fixed Dome)? Camera) ([\d\.]+) .* ready\.?$" flags="REG_ICASE">
-    <example>Axis 2100 Network Camera 2.43 Nov 04 2008 ready.</example>
+  <fingerprint pattern="^AXIS (\S+) (?:Network(?: Fixed Dome)? Camera) ([\d\.]+) .* ready\.?$" flags="REG_ICASE">
+    <example os.product="2100" os.version="2.43">Axis 2100 Network Camera 2.43 Nov 04 2008 ready.</example>
     <example>AXIS 207 Network Camera 4.40.1 (Apr 16 2007) ready.</example>
     <example>AXIS 216FD Network Fixed Dome Camera 4.47 (Mar 13 2008) ready.</example>
     <description>Axis Network Camera</description>
     <param pos="0" name="os.vendor" value="Axis"/>
     <param pos="0" name="os.device" value="Web cam"/>
@@ -554,9 +556,10 @@
     <example>LinkCom Xpress 10/100 +IPDS FTP version 1.0 ready</example>
     <param pos="0" name="os.vendor" value="MPI Technologies"/>
     <param pos="0" name="os.family" value="LinkCom Xpress"/>
     <param pos="0" name="os.device" value="Print server"/>
     <param pos="1" name="os.product"/>
+    <param pos="2" name="os.version"/>
   </fingerprint>
   <fingerprint pattern="^LinkCom Xpress (.*)$" certainty="1.0">
     <description>MPI Technologies Linkcom Express FTP Server</description>
     <example>LinkCom Xpress EIO PRO 10</example>
     <param pos="0" name="os.vendor" value="MPI Technologies"/>