[Openvas-commits] r6130 - in trunk/openvas-plugins: . scripts

[scm-commit@wald.intevation.org]

Author: mime
Date: 2009-12-12 13:41:25 +0100 (Sat, 12 Dec 2009)
New Revision: 6130

Modified:
   trunk/openvas-plugins/ChangeLog
   trunk/openvas-plugins/scripts/cpe.inc
   trunk/openvas-plugins/scripts/ePo_detect.nasl
Log:
Set cpe KB entry directly in script.

Modified: trunk/openvas-plugins/ChangeLog
===================================================================
--- trunk/openvas-plugins/ChangeLog	2009-12-12 11:23:23 UTC (rev 6129)
+++ trunk/openvas-plugins/ChangeLog	2009-12-12 12:41:25 UTC (rev 6130)
@@ -1,6 +1,14 @@
 2009-12-12 Michael Meyer <michael.meyer at intevation.de>
 
 	* scripts/ePo_detect.nasl:
+	Set cpe KB entry directly in script.
+
+	* scripts/cpe.inc:
+	Removed ePoAgent. 
+
+2009-12-12 Michael Meyer <michael.meyer at intevation.de>
+
+	* scripts/ePo_detect.nasl:
 	Set version to "unknown" in KB if version could not 
 	be fetched.
 

Modified: trunk/openvas-plugins/scripts/cpe.inc
===================================================================
--- trunk/openvas-plugins/scripts/cpe.inc	2009-12-12 11:23:23 UTC (rev 6129)
+++ trunk/openvas-plugins/scripts/cpe.inc	2009-12-12 12:41:25 UTC (rev 6130)
@@ -725,7 +725,6 @@
 "ldap/*/eDirectory", "^([0-9.]+\.[0-9])\.?([a-z0-9]+)?", "cpe:/a:novell:edirectory:",
 "ftp/*/Serv-U", "^([0-9.]+)","cpe:/a:rhinosoft:serv-u:",
 "www/*/XOOPS", "^([0-9.]+\.[0-9])\.?([a-z0-9])?", "cpe:/a:xoops:xoops:",
-"www/*/ePoAgent/Version","^([0-9.]+([a-z0-9]+)?)","cpe:/a:mcafee:agent:",
 "HTML-Parser/Linux/Ver", "^([0-9.]+)", "cpe:/a:derrick_oswald:html-parser:",
 "JetAudio/Ver", "^([0-9.]+)", "cpe:/a:cowonamerica:cowon_media_center-jetaudio:",
 "Blender/Lin/Ver", "^([0-9.]+([a-z0-9]+)?)", "cpe:/a:blender:blender:",

Modified: trunk/openvas-plugins/scripts/ePo_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/ePo_detect.nasl	2009-12-12 11:23:23 UTC (rev 6129)
+++ trunk/openvas-plugins/scripts/ePo_detect.nasl	2009-12-12 12:41:25 UTC (rev 6130)
@@ -113,8 +113,10 @@
     if(!isnull(vers)) {
       info += string("ClientVersion: ", vers, "\n");
       set_kb_item(name: string("www/", port, "/ePoAgent/Version"), value: vers);
+      set_kb_item(name: string("cpe:/a:mcafee:agent:",vers), value: TRUE);
     } else {
       set_kb_item(name: string("www/", port, "/ePoAgent/Version"), value: string("unknown"));
+      set_kb_item(name: string("cpe:/a:mcafee:agent"), value: TRUE);
     }  
  
     if(!isnull(rserver)) {