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

[scm-commit@wald.intevation.org]

Author: hdoreau
Date: 2011-09-06 09:50:22 +0200 (Tue, 06 Sep 2011)
New Revision: 11567

Modified:
   trunk/openvas-plugins/ChangeLog
   trunk/openvas-plugins/scripts/base_36830.nasl
   trunk/openvas-plugins/scripts/base_detect.nasl
   trunk/openvas-plugins/scripts/cpe.inc
Log:
* scripts/base_36830.nasl, scripts/base_detect.nasl, scripts/cpe.inc:
Remove duplicate entry for BASE. Use the uppercase key everywhere.
[Mareike Piechowiak]


Modified: trunk/openvas-plugins/ChangeLog
===================================================================
--- trunk/openvas-plugins/ChangeLog	2011-09-06 07:41:35 UTC (rev 11566)
+++ trunk/openvas-plugins/ChangeLog	2011-09-06 07:50:22 UTC (rev 11567)
@@ -1,5 +1,11 @@
 2011-09-06  Henri Doreau <henri.doreau at greenbone.net>
 
+	* scripts/base_36830.nasl, scripts/base_detect.nasl, scripts/cpe.inc:
+	Remove duplicate entry for BASE. Use the uppercase key everywhere.
+	[Mareike Piechowiak]
+
+2011-09-06  Henri Doreau <henri.doreau at greenbone.net>
+
 	* scripts/secpod_vmware_springsource_tc_server_sec_bypass_vuln.nasl,
 	scripts/secpod_vmware_springsource_tc_server_detect.nasl, cpe.inc:
 	Fixed typos in KB key for VMware SSTC Server. [Mareike Piechowiak]

Modified: trunk/openvas-plugins/scripts/base_36830.nasl
===================================================================
--- trunk/openvas-plugins/scripts/base_36830.nasl	2011-09-06 07:41:35 UTC (rev 11566)
+++ trunk/openvas-plugins/scripts/base_36830.nasl	2011-09-06 07:50:22 UTC (rev 11567)
@@ -82,7 +82,7 @@
 
 if (!can_host_php(port:port)) exit(0);
 
-if(!version = get_kb_item(string("www/", port, "/base")))exit(0);
+if(!version = get_kb_item(string("www/", port, "/BASE")))exit(0);
 if(!matches = eregmatch(string:version, pattern:"^(.+) under (/.*)$"))exit(0);
 
 vers = matches[1];

Modified: trunk/openvas-plugins/scripts/base_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/base_detect.nasl	2011-09-06 07:41:35 UTC (rev 11566)
+++ trunk/openvas-plugins/scripts/base_detect.nasl	2011-09-06 07:50:22 UTC (rev 11567)
@@ -92,7 +92,7 @@
        vers=chomp(version[1]);
     }
 
-    set_kb_item(name: string("www/", port, "/base"), value: string(vers," under ",install));
+    set_kb_item(name: string("www/", port, "/BASE"), value: string(vers," under ",install));
 
     info = string("None\n\nBasic Analysis and Security Engine (BASE) Version '");
     info += string(vers);

Modified: trunk/openvas-plugins/scripts/cpe.inc
===================================================================
--- trunk/openvas-plugins/scripts/cpe.inc	2011-09-06 07:41:35 UTC (rev 11566)
+++ trunk/openvas-plugins/scripts/cpe.inc	2011-09-06 07:50:22 UTC (rev 11567)
@@ -733,7 +733,6 @@
 "www/*/landesk", "^([0-9.]+([a-z0-9]+)?)", "cpe:/a:landesk:landesk_management_suite:",
 "Snort/Linux/Ver", "^([0-9.]+)", "cpe:/a:snort:snort:",
 "www/*/joomla", "^([0-9.]+)", "cpe:/a:joomla:joomla",
-"www/*/base", "^([0-9.]+)", "cpe:/a:base:basic_analysis_and_security_engine:",
 "www/*/tftgallery", "^([0-9.]+)", "cpe:/a:tftgallery:tftgallery:",
 "SquidGuard/Ver", "^([0-9.]+)", "cpe:/a:squidguard:squidguard:",
 "EurekaEmail/Ver", "^([0-9.]+)", "cpe:/a:eureka-email:eureka_email:",