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

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Tue Sep 20 14:40:45 CEST 2011


Author: hdoreau
Date: 2011-09-20 14:40:22 +0200 (Tue, 20 Sep 2011)
New Revision: 11639

Modified:
   trunk/openvas-plugins/ChangeLog
   trunk/openvas-plugins/scripts/AproxEngine_detect.nasl
   trunk/openvas-plugins/scripts/JBoss_enterprise_aplication_server_detect.nasl
   trunk/openvas-plugins/scripts/MercuryBoard_detect.nasl
   trunk/openvas-plugins/scripts/PHPMySpace_detect.nasl
   trunk/openvas-plugins/scripts/awstats_detect.nasl
   trunk/openvas-plugins/scripts/boastMachine_detect.nasl
   trunk/openvas-plugins/scripts/centreon_detect.nasl
   trunk/openvas-plugins/scripts/ePo_detect.nasl
   trunk/openvas-plugins/scripts/ejabberd_detect.nasl
   trunk/openvas-plugins/scripts/gb_AjaXplorer_detect.nasl
   trunk/openvas-plugins/scripts/gb_ManageEngine_ServiceDesk_Plus_detect.nasl
   trunk/openvas-plugins/scripts/gb_SyndeoCMS_detect.nasl
   trunk/openvas-plugins/scripts/gb_aeromail_detect.nasl
   trunk/openvas-plugins/scripts/gb_apache_axis2_detect.nasl
   trunk/openvas-plugins/scripts/gb_apache_derby_detect.nasl
   trunk/openvas-plugins/scripts/gb_barracuda_spam_virus_firewall_detect.nasl
   trunk/openvas-plugins/scripts/gb_clamav_remote_detect.nasl
   trunk/openvas-plugins/scripts/gb_coldfusion_detect.nasl
   trunk/openvas-plugins/scripts/gb_collabtive_detect.nasl
   trunk/openvas-plugins/scripts/gb_couchdb_detect.nasl
   trunk/openvas-plugins/scripts/gb_egroupware_detect.nasl
   trunk/openvas-plugins/scripts/gb_emc_networker_detect.nasl
   trunk/openvas-plugins/scripts/gb_exponet_cms_detect.nasl
   trunk/openvas-plugins/scripts/gb_freenas_detect.nasl
   trunk/openvas-plugins/scripts/gb_freepbx_detect.nasl
   trunk/openvas-plugins/scripts/gb_fsecure_internet_gatekeeper_detect.nasl
   trunk/openvas-plugins/scripts/gb_greenbone_os_detect.nasl
   trunk/openvas-plugins/scripts/gb_groupoffice_detect.nasl
   trunk/openvas-plugins/scripts/gb_hp_performance_insight_detect.nasl
   trunk/openvas-plugins/scripts/gb_ibm_soliddb_detect.nasl
   trunk/openvas-plugins/scripts/gb_ibm_websphere_detect.nasl
   trunk/openvas-plugins/scripts/gb_informix_detect.nasl
   trunk/openvas-plugins/scripts/gb_ingate_firewall_detect.nasl
   trunk/openvas-plugins/scripts/gb_ingate_siparator_detect.nasl
   trunk/openvas-plugins/scripts/gb_interchange_web_detect.nasl
   trunk/openvas-plugins/scripts/gb_ldap_account_manager_detect.nasl
   trunk/openvas-plugins/scripts/gb_lotus_domino_detect.nasl
   trunk/openvas-plugins/scripts/gb_nuralstorm_webmail_detect.nasl
   trunk/openvas-plugins/scripts/gb_openemr_detect.nasl
   trunk/openvas-plugins/scripts/gb_openengine_detect.nasl
   trunk/openvas-plugins/scripts/gb_orangehrm_detect.nasl
   trunk/openvas-plugins/scripts/gb_ossim_web_detect.nasl
   trunk/openvas-plugins/scripts/gb_particle_wiki_detect.nasl
   trunk/openvas-plugins/scripts/gb_php_support_tickets_detect.nasl
   trunk/openvas-plugins/scripts/gb_phplist_detect.nasl
   trunk/openvas-plugins/scripts/gb_sap_maxdb_detect.nasl
   trunk/openvas-plugins/scripts/gb_sawmill_detect.nasl
   trunk/openvas-plugins/scripts/gb_splunk_detect.nasl
   trunk/openvas-plugins/scripts/gb_vtiger_crm_detect.nasl
   trunk/openvas-plugins/scripts/gb_webid_detect.nasl
   trunk/openvas-plugins/scripts/hp_power_manager_detect.nasl
   trunk/openvas-plugins/scripts/mt_detect.nasl
   trunk/openvas-plugins/scripts/novell_imanager_detect.nasl
   trunk/openvas-plugins/scripts/open_media_collectors_database_detect.nasl
   trunk/openvas-plugins/scripts/oracle_webLogic_server_detect.nasl
   trunk/openvas-plugins/scripts/pdns_version.nasl
   trunk/openvas-plugins/scripts/pligg_cms_detect.nasl
   trunk/openvas-plugins/scripts/quicksilver_forums_detect.nasl
   trunk/openvas-plugins/scripts/sun_dir_server_detect.nasl
   trunk/openvas-plugins/scripts/support_incident_tracker_detect.nasl
   trunk/openvas-plugins/scripts/testlink_detect.nasl
   trunk/openvas-plugins/scripts/unbound_version.nasl
   trunk/openvas-plugins/scripts/zabbix_detect.nasl
   trunk/openvas-plugins/scripts/zabbix_web_detect.nasl
Log:
* scripts/gb_phplist_detect.nasl,
scripts/sun_dir_server_detect.nasl,
scripts/hp_power_manager_detect.nasl,
scripts/novell_imanager_detect.nasl,
scripts/testlink_detect.nasl,
scripts/gb_webid_detect.nasl,
scripts/mt_detect.nasl,
scripts/gb_openengine_detect.nasl,
scripts/support_incident_tracker_detect.nasl,
scripts/gb_ossim_web_detect.nasl,
scripts/gb_aeromail_detect.nasl,
scripts/gb_ingate_firewall_detect.nasl,
scripts/gb_ManageEngine_ServiceDesk_Plus_detect.nasl,
scripts/gb_apache_axis2_detect.nasl,
scripts/gb_fsecure_internet_gatekeeper_detect.nasl,
scripts/gb_apache_derby_detect.nasl,
scripts/open_media_collectors_database_detect.nasl,
scripts/gb_exponet_cms_detect.nasl,
scripts/gb_openemr_detect.nasl,
scripts/gb_emc_networker_detect.nasl,
scripts/ePo_detect.nasl,
scripts/gb_SyndeoCMS_detect.nasl,
scripts/gb_collabtive_detect.nasl,
scripts/gb_greenbone_os_detect.nasl,
scripts/gb_freenas_detect.nasl,
scripts/unbound_version.nasl,
scripts/quicksilver_forums_detect.nasl,
scripts/gb_hp_performance_insight_detect.nasl,
scripts/gb_barracuda_spam_virus_firewall_detect.nasl,
scripts/gb_sap_maxdb_detect.nasl,
scripts/gb_clamav_remote_detect.nasl,
scripts/gb_interchange_web_detect.nasl,
scripts/pdns_version.nasl,
scripts/zabbix_detect.nasl,
scripts/MercuryBoard_detect.nasl,
scripts/gb_ldap_account_manager_detect.nasl,
scripts/gb_sawmill_detect.nasl,
scripts/gb_nuralstorm_webmail_detect.nasl,
scripts/pligg_cms_detect.nasl,
scripts/gb_splunk_detect.nasl,
scripts/centreon_detect.nasl,
scripts/gb_groupoffice_detect.nasl,
scripts/gb_egroupware_detect.nasl,
scripts/PHPMySpace_detect.nasl,
scripts/AproxEngine_detect.nasl,
scripts/gb_informix_detect.nasl,
scripts/gb_orangehrm_detect.nasl,
scripts/gb_couchdb_detect.nasl,
scripts/gb_ibm_soliddb_detect.nasl,
scripts/gb_lotus_domino_detect.nasl,
scripts/gb_ibm_websphere_detect.nasl,
scripts/boastMachine_detect.nasl,
scripts/gb_ingate_siparator_detect.nasl,
scripts/oracle_webLogic_server_detect.nasl,
scripts/gb_vtiger_crm_detect.nasl,
scripts/gb_php_support_tickets_detect.nasl,
scripts/gb_freepbx_detect.nasl,
scripts/JBoss_enterprise_aplication_server_detect.nasl,
scripts/gb_AjaXplorer_detect.nasl,
scripts/gb_particle_wiki_detect.nasl,
scripts/ejabberd_detect.nasl,
scripts/awstats_detect.nasl,
scripts/zabbix_web_detect.nasl,
scripts/gb_coldfusion_detect.nasl: Register CPEs as host details.


Modified: trunk/openvas-plugins/ChangeLog
===================================================================
--- trunk/openvas-plugins/ChangeLog	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/ChangeLog	2011-09-20 12:40:22 UTC (rev 11639)
@@ -1,3 +1,70 @@
+2011-09-20  Henri Doreau <henri.doreau at greenbone.net>
+
+	* scripts/gb_phplist_detect.nasl,
+	scripts/sun_dir_server_detect.nasl,
+	scripts/hp_power_manager_detect.nasl,
+	scripts/novell_imanager_detect.nasl,
+	scripts/testlink_detect.nasl,
+	scripts/gb_webid_detect.nasl,
+	scripts/mt_detect.nasl,
+	scripts/gb_openengine_detect.nasl,
+	scripts/support_incident_tracker_detect.nasl,
+	scripts/gb_ossim_web_detect.nasl,
+	scripts/gb_aeromail_detect.nasl,
+	scripts/gb_ingate_firewall_detect.nasl,
+	scripts/gb_ManageEngine_ServiceDesk_Plus_detect.nasl,
+	scripts/gb_apache_axis2_detect.nasl,
+	scripts/gb_fsecure_internet_gatekeeper_detect.nasl,
+	scripts/gb_apache_derby_detect.nasl,
+	scripts/open_media_collectors_database_detect.nasl,
+	scripts/gb_exponet_cms_detect.nasl,
+	scripts/gb_openemr_detect.nasl,
+	scripts/gb_emc_networker_detect.nasl,
+	scripts/ePo_detect.nasl,
+	scripts/gb_SyndeoCMS_detect.nasl,
+	scripts/gb_collabtive_detect.nasl,
+	scripts/gb_greenbone_os_detect.nasl,
+	scripts/gb_freenas_detect.nasl,
+	scripts/unbound_version.nasl,
+	scripts/quicksilver_forums_detect.nasl,
+	scripts/gb_hp_performance_insight_detect.nasl,
+	scripts/gb_barracuda_spam_virus_firewall_detect.nasl,
+	scripts/gb_sap_maxdb_detect.nasl,
+	scripts/gb_clamav_remote_detect.nasl,
+	scripts/gb_interchange_web_detect.nasl,
+	scripts/pdns_version.nasl,
+	scripts/zabbix_detect.nasl,
+	scripts/MercuryBoard_detect.nasl,
+	scripts/gb_ldap_account_manager_detect.nasl,
+	scripts/gb_sawmill_detect.nasl,
+	scripts/gb_nuralstorm_webmail_detect.nasl,
+	scripts/pligg_cms_detect.nasl,
+	scripts/gb_splunk_detect.nasl,
+	scripts/centreon_detect.nasl,
+	scripts/gb_groupoffice_detect.nasl,
+	scripts/gb_egroupware_detect.nasl,
+	scripts/PHPMySpace_detect.nasl,
+	scripts/AproxEngine_detect.nasl,
+	scripts/gb_informix_detect.nasl,
+	scripts/gb_orangehrm_detect.nasl,
+	scripts/gb_couchdb_detect.nasl,
+	scripts/gb_ibm_soliddb_detect.nasl,
+	scripts/gb_lotus_domino_detect.nasl,
+	scripts/gb_ibm_websphere_detect.nasl,
+	scripts/boastMachine_detect.nasl,
+	scripts/gb_ingate_siparator_detect.nasl,
+	scripts/oracle_webLogic_server_detect.nasl,
+	scripts/gb_vtiger_crm_detect.nasl,
+	scripts/gb_php_support_tickets_detect.nasl,
+	scripts/gb_freepbx_detect.nasl,
+	scripts/JBoss_enterprise_aplication_server_detect.nasl,
+	scripts/gb_AjaXplorer_detect.nasl,
+	scripts/gb_particle_wiki_detect.nasl,
+	scripts/ejabberd_detect.nasl,
+	scripts/awstats_detect.nasl,
+	scripts/zabbix_web_detect.nasl,
+	scripts/gb_coldfusion_detect.nasl: Register CPEs as host details.
+
 2011-09-20  Michael Meyer <michael.meyer at greenbone.net>
 
 	* scripts/gb_wordpress_49688.nasl,

Modified: trunk/openvas-plugins/scripts/AproxEngine_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/AproxEngine_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/AproxEngine_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -55,7 +55,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100425";
+NVT_DESC = "AproxEngine CMS Detection";
+
 port = get_http_port(default:80);
 
 if(!get_port_state(port))exit(0);
@@ -84,9 +88,9 @@
 
     if ( !isnull(version[1]) ) {
        vers=chomp(version[1]);
-       set_kb_item(name: string("cpe:/a:aprox:aproxengine:",vers), value: TRUE);
+       register_host_detail(name:"App", value:string("cpe:/a:aprox:aproxengine:",vers), nvt:NVT_OID, desc:NVT_DESC);
     } else {
-       set_kb_item(name: string("cpe:/a:aprox:aproxengine"), value: TRUE);
+       register_host_detail(name:"App", value:string("cpe:/a:aprox:aproxengine"), nvt:NVT_OID, desc:NVT_DESC);
     }  
 
     set_kb_item(name: string("www/", port, "/AproxEngine"), value: string(vers," under ",install));

Modified: trunk/openvas-plugins/scripts/JBoss_enterprise_aplication_server_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/JBoss_enterprise_aplication_server_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/JBoss_enterprise_aplication_server_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -56,6 +56,9 @@
 include("cpe.inc");
 include("host_details.inc");
 
+
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100387";
+NVT_DESC = "JBoss Enterprise Application Server Detection";
 ## Constant values
 SCRIPT_OID  = "1.3.6.1.4.1.25623.1.0.100387";
 SCRIPT_DESC = "JBoss Enterprise Application Server Detection";
@@ -73,7 +76,7 @@
    if(!isnull(version[1])) {
 
      set_kb_item(name: string("www/", port, "/jboss_enterprise_application_server"), value: version[1]);
-     set_kb_item(name: string("cpe:/a:jboss:enterprise_application_platform:",version[1]), value: TRUE);
+     register_host_detail(name:"App", value:string("cpe:/a:jboss:enterprise_application_platform:",version[1]), nvt:NVT_OID, desc:NVT_DESC);
   
      ## build cpe and store it as host_detail
      cpe = build_cpe(value:version[1], exp:"^([0-9.]+)([GA_CP0-9]*)", base:"cpe:/a:redhat:jboss_enterprise_application_platform:");

Modified: trunk/openvas-plugins/scripts/MercuryBoard_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/MercuryBoard_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/MercuryBoard_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -55,7 +55,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100423";
+NVT_DESC = "MercuryBoard Detection";
+
 port = get_http_port(default:80);
 
 if(!get_port_state(port))exit(0);
@@ -84,9 +88,9 @@
 
     if ( !isnull(version[1]) ) {
        vers=chomp(version[1]);
-       set_kb_item(name: string("cpe:/a:mercuryboard:mercuryboard:",vers), value: TRUE);
+       register_host_detail(name:"App", value:string("cpe:/a:mercuryboard:mercuryboard:",vers), nvt:NVT_OID, desc:NVT_DESC);
     } else {
-       set_kb_item(name: string("cpe:/a:mercuryboard:mercuryboard"), value: TRUE);
+       register_host_detail(name:"App", value:string("cpe:/a:mercuryboard:mercuryboard"), nvt:NVT_OID, desc:NVT_DESC);
     }  
 
     set_kb_item(name: string("www/", port, "/mercuryboard"), value: string(vers," under ",install));

Modified: trunk/openvas-plugins/scripts/PHPMySpace_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/PHPMySpace_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/PHPMySpace_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -56,7 +56,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100464";
+NVT_DESC = "PHPMySpace Detection";
+
 port = get_http_port(default:80);
 
 if(!get_port_state(port))exit(0);
@@ -86,9 +90,9 @@
 
     if ( !isnull(version[1]) ) {
        vers=chomp(version[1]);
-       set_kb_item(name: string("cpe:/a:phpmyspace:phpmyspace:",vers,"::gold"), value: TRUE);
+       register_host_detail(name:"App", value:string("cpe:/a:phpmyspace:phpmyspace:",vers,"::gold"), nvt:NVT_OID, desc:NVT_DESC);
     } else {
-       set_kb_item(name: string("cpe:/a:phpmyspace:phpmyspace:::gold"), value: TRUE);
+       register_host_detail(name:"App", value:string("cpe:/a:phpmyspace:phpmyspace:::gold"), nvt:NVT_OID, desc:NVT_DESC);
     }
 
     set_kb_item(name: string("www/", port, "/phpMySpace"), value: string(vers," under ",install));

Modified: trunk/openvas-plugins/scripts/awstats_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/awstats_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/awstats_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -57,7 +57,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100376";
+NVT_DESC = "AWStats Detection";
+
 port = get_http_port(default:80);
 
 if(!get_port_state(port))exit(0);
@@ -94,9 +98,9 @@
 
     set_kb_item(name: string("www/", port, "/awstats"), value: string(vers," under ",install));
     if("unknown" >!< vers) {
-      set_kb_item(name: string("cpe:/a:awstats:awstats:",vers), value: TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:awstats:awstats:",vers), nvt:NVT_OID, desc:NVT_DESC);
     } else {
-      set_kb_item(name: string("cpe:/a:awstats:awstats"), value: TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:awstats:awstats"), nvt:NVT_OID, desc:NVT_DESC);
     }  
 
     info = string("None\n\nAwstats Version '");

Modified: trunk/openvas-plugins/scripts/boastMachine_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/boastMachine_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/boastMachine_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -54,7 +54,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100460";
+NVT_DESC = "boastMachine Detection";
+
 port = get_http_port(default:80);
 
 if(!get_port_state(port))exit(0);
@@ -83,9 +87,9 @@
 
     if ( !isnull(version[1]) ) {
        vers=chomp(version[1]);
-       set_kb_item(name: string("cpe:/a:kailash_nadh:boastmachine:",vers), value: TRUE);
+       register_host_detail(name:"App", value:string("cpe:/a:kailash_nadh:boastmachine:",vers), nvt:NVT_OID, desc:NVT_DESC);
     } else {
-       set_kb_item(name: string("cpe:/a:kailash_nadh:boastmachine"), value: TRUE);
+       register_host_detail(name:"App", value:string("cpe:/a:kailash_nadh:boastmachine"), nvt:NVT_OID, desc:NVT_DESC);
     }  
 
     set_kb_item(name: string("www/", port, "/boastMachine"), value: string(vers," under ",install));

Modified: trunk/openvas-plugins/scripts/centreon_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/centreon_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/centreon_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -58,7 +58,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100427";
+NVT_DESC = "Centreon Detection";
+
 port = get_http_port(default:80);
 
 if(!get_port_state(port))exit(0);
@@ -88,9 +92,9 @@
 
     if ( !isnull(version[1]) ) {
        vers=chomp(version[1]);
-       set_kb_item(name: string("cpe:/a:centreon:centreon:",vers), value: TRUE);
+       register_host_detail(name:"App", value:string("cpe:/a:centreon:centreon:",vers), nvt:NVT_OID, desc:NVT_DESC);
     } else {
-       set_kb_item(name: string("cpe:/a:centreon:centreon"), value: TRUE);
+       register_host_detail(name:"App", value:string("cpe:/a:centreon:centreon"), nvt:NVT_OID, desc:NVT_DESC);
     }  
 
     set_kb_item(name: string("www/", port, "/centreon"), value: string(vers," under ",install));

Modified: trunk/openvas-plugins/scripts/ePo_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/ePo_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/ePo_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -53,6 +53,9 @@
 include("cpe.inc");
 include("host_details.inc");
 
+
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100329";
+NVT_DESC = "ePo Agent Detection";
 ## Constant values
 SCRIPT_OID  = "1.3.6.1.4.1.25623.1.0.100329";
 SCRIPT_DESC = "ePo Agent Detection";
@@ -131,14 +134,14 @@
     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);
+      register_host_detail(name:"App", value:string("cpe:/a:mcafee:agent:",vers), nvt:NVT_OID, desc:NVT_DESC);
 
       ## build cpe and store it as host_detail
       register_cpe(tmpVers:vers, tmpExpr:"^([0-9.]+([a-z0-9]+)?)", tmpBase:"cpe:/a:mcafee:epolicy_orchestrator:");
 
     } else {
       set_kb_item(name: string("www/", port, "/ePoAgent/Version"), value: string("unknown"));
-      set_kb_item(name: string("cpe:/a:mcafee:agent"), value: TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:mcafee:agent"), nvt:NVT_OID, desc:NVT_DESC);
 
       ## build cpe and store it as host_detail
       register_cpe(tmpVers:string("unknown"), tmpExpr:"^([0-9.]+([a-z0-9]+)?)", tmpBase:"cpe:/a:mcafee:epolicy_orchestrator:");

Modified: trunk/openvas-plugins/scripts/ejabberd_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/ejabberd_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/ejabberd_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -50,7 +50,11 @@
 }
 
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100486";
+NVT_DESC = "ejabberd Detection";
+
 xmpp_port = get_kb_item("Services/xmpp");
 if(!xmpp_port)xmpp_port=5222;
 if(!get_port_state(xmpp_port))exit(0);
@@ -60,7 +64,7 @@
   version = get_kb_item(string("xmpp/", xmpp_port, "/version"));
   if(!isnull(version)) {
     set_kb_item(name: string("xmpp/", xmpp_port, "/ejabberd"), value: version);
-    set_kb_item(name: string("cpe:/a:process-one:ejabberd:",version), value: TRUE);
+    register_host_detail(name:"App", value:string("cpe:/a:process-one:ejabberd:",version), nvt:NVT_OID, desc:NVT_DESC);
     info = string("None\n\nejabberd version '", version, "' was detected by OpenVAS.\n");
     desc = ereg_replace(
          string:desc,
@@ -96,7 +100,7 @@
 
       if(!KB_SET) {
         set_kb_item(name: string("xmpp/", xmpp_port, "/ejabberd"), value: version);
-	set_kb_item(name: string("cpe:/a:process-one:ejabberd:",version), value: TRUE);
+ register_host_detail(name:"App", value:string("cpe:/a:process-one:ejabberd:",version), nvt:NVT_OID, desc:NVT_DESC);
       }  
 
       info = string("ejabberd Web Admin (ejabberd version '",version,"') is running at this port.\n");

Modified: trunk/openvas-plugins/scripts/gb_AjaXplorer_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_AjaXplorer_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/gb_AjaXplorer_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -55,7 +55,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100573";
+NVT_DESC = "AjaXplorer Detection";
+
 port = get_http_port(default:80);
 
 if(!get_port_state(port))exit(0);
@@ -84,9 +88,9 @@
 
     if ( !isnull(version[1]) ) {
        vers=chomp(version[1]);
-       set_kb_item(name:string("cpe:/a:ajaxplorer:ajaxplorer:",vers), value:TRUE);
+       register_host_detail(name:"App", value:string("cpe:/a:ajaxplorer:ajaxplorer:",vers), nvt:NVT_OID, desc:NVT_DESC);
     } else {
-       set_kb_item(name:string("cpe:/a:ajaxplorer:ajaxplorer"), value:TRUE);
+       register_host_detail(name:"App", value:string("cpe:/a:ajaxplorer:ajaxplorer"), nvt:NVT_OID, desc:NVT_DESC);
     }  
 
     set_kb_item(name: string("www/", port, "/AjaXplorer"), value: string(vers," under ",install));

Modified: trunk/openvas-plugins/scripts/gb_ManageEngine_ServiceDesk_Plus_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_ManageEngine_ServiceDesk_Plus_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/gb_ManageEngine_ServiceDesk_Plus_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -55,7 +55,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.103183";
+NVT_DESC = "ManageEngine ServiceDesk Plus Detection";
+
 port = get_http_port(default:8080);
 
 if(!get_port_state(port))exit(0);
@@ -91,9 +95,9 @@
    set_kb_item(name: string("www/", port, "/ManageEngine"), value: string(vers," under ",install));
    
    if( ! isnull ( vers ) ) {
-     set_kb_item(name:string("cpe:/a:manageengine:servicedesk_plus:",major,":build_",BUILD), value:TRUE);
+     register_host_detail(name:"App", value:string("cpe:/a:manageengine:servicedesk_plus:",major,":build_",BUILD), nvt:NVT_OID, desc:NVT_DESC);
    } else {
-     set_kb_item(name:string("cpe:/a:manageengine:servicedesk_plus"), value:TRUE);
+     register_host_detail(name:"App", value:string("cpe:/a:manageengine:servicedesk_plus"), nvt:NVT_OID, desc:NVT_DESC);
    }  
 
    info = string("desk/\n\nManageEngine ServiceDesk Plus Version '");

Modified: trunk/openvas-plugins/scripts/gb_SyndeoCMS_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_SyndeoCMS_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/gb_SyndeoCMS_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -55,7 +55,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100783";
+NVT_DESC = "SyndeoCMS Detection";
+
 port = get_http_port(default:80);
 
 if(!get_port_state(port))exit(0);
@@ -102,9 +106,9 @@
     set_kb_item(name: string("www/", port, "/syndeocms"), value: string(vers," under ",install));
 
     if(vers != "unknown") {
-      set_kb_item(name: string("cpe:/a:syndeocms:syndeocms:",vers), value: TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:syndeocms:syndeocms:",vers), nvt:NVT_OID, desc:NVT_DESC);
     } else {
-      set_kb_item(name: string("cpe:/a:syndeocms:syndeocms:"), value: TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:syndeocms:syndeocms:"), nvt:NVT_OID, desc:NVT_DESC);
     }  
 
     info = string("org\n\nSyndeoCMS Version '");

Modified: trunk/openvas-plugins/scripts/gb_aeromail_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_aeromail_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/gb_aeromail_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -55,7 +55,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.103204";
+NVT_DESC = "AeroMail Detection";
+
 port = get_http_port(default:80);
 
 if(!get_port_state(port))exit(0);
@@ -89,9 +93,9 @@
     set_kb_item(name: string("www/", port, "/AeroMail"), value: string(vers," under ",install));
 
     if(vers == "unknown") {
-      set_kb_item(name: string("cpe:/a:aeromail:aeromail"), value: TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:aeromail:aeromail"), nvt:NVT_OID, desc:NVT_DESC);
     } else {
-      set_kb_item(name: string("cpe:/a:aeromail:aeromail:",vers), value: TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:aeromail:aeromail:",vers), nvt:NVT_OID, desc:NVT_DESC);
     }  
 
     info = string("aeromail/\n\nAeroMail Version '");

Modified: trunk/openvas-plugins/scripts/gb_apache_axis2_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_apache_axis2_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/gb_apache_axis2_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -53,7 +53,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100813";
+NVT_DESC = "Apache Axis2 Detection";
+
 port = get_http_port(default:8081);
 if(!get_port_state(port))exit(0);
 
@@ -85,9 +89,9 @@
     set_kb_item(name: string("www/", port, "/axis2"), value: string(vers," under ",install));
 
     if(vers != "unknown") {
-      set_kb_item(name: string("cpe:/a:apache:axis2:",vers), value:TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:apache:axis2:",vers), nvt:NVT_OID, desc:NVT_DESC);
     } else {
-      set_kb_item(name: string("cpe:/a:apache:axis2:"), value:TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:apache:axis2:"), nvt:NVT_OID, desc:NVT_DESC);
     }  
 
     info = string("/\n\nApache Axis2 Version '");

Modified: trunk/openvas-plugins/scripts/gb_apache_derby_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_apache_derby_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/gb_apache_derby_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -54,7 +54,11 @@
 include("misc_func.inc");
 include("dump.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100795";
+NVT_DESC = "Apache Derby Detection";
+
 function bin2string (ddata) {
  local_var tmp, i, j, line, linenumber, len, data, c;
 
@@ -146,10 +150,10 @@
       }
 
       set_kb_item(name:string("apache_derby/",port,"/version"),value:ver);
-      set_kb_item(name:string("cpe:/a:apache:derby:",ver),value:TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:apache:derby:",ver), nvt:NVT_OID, desc:NVT_DESC);
 
     } else {
-      set_kb_item(name:string("cpe:/a:apache:derby"),value:TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:apache:derby"), nvt:NVT_OID, desc:NVT_DESC);
     }
 
     info = string("derby/\n\nApache Derby Version '");

Modified: trunk/openvas-plugins/scripts/gb_barracuda_spam_virus_firewall_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_barracuda_spam_virus_firewall_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/gb_barracuda_spam_virus_firewall_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -53,7 +53,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100846";
+NVT_DESC = "Barracuda Spam & Virus Firewall Detection";
+
 port = get_http_port(default:8000);
 if(!get_port_state(port))exit(0);
 
@@ -84,9 +88,9 @@
    set_kb_item(name: string("www/", port, "/barracuda_spam_virus_firewall"), value: string(vers," under ",install));
 
    if(vers == "unknown") {
-     set_kb_item(name:string("cpe:/h:barracuda_networks:barracuda_spam_firewall"),value:TRUE);
+     register_host_detail(name:"App", value:string("cpe:/h:barracuda_networks:barracuda_spam_firewall"), nvt:NVT_OID, desc:NVT_DESC);
    } else {
-     set_kb_item(name:string("cpe:/h:barracuda_networks:barracuda_spam_firewall:",vers),value:TRUE);
+     register_host_detail(name:"App", value:string("cpe:/h:barracuda_networks:barracuda_spam_firewall:",vers), nvt:NVT_OID, desc:NVT_DESC);
    }  
 
    info = string("en\n\nBarracuda Spam & Virus Firewall Version '");

Modified: trunk/openvas-plugins/scripts/gb_clamav_remote_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_clamav_remote_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/gb_clamav_remote_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -50,7 +50,11 @@
 }
 
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100651";
+NVT_DESC = "ClamAV Version Detection Detection";
+
 port = get_kb_item("Services/clamd");
 if(!port) port = 3310;
 if(!get_port_state(port))exit(0);
@@ -69,7 +73,7 @@
 if(isnull(version[1]))exit(0);
 
 set_kb_item(name:"ClamAV/remote/Ver", value: version[1]);
-set_kb_item(name: string("cpe:/a:clamav:clamav:",version[1]), value: TRUE);
+register_host_detail(name:"App", value:string("cpe:/a:clamav:clamav:",version[1]), nvt:NVT_OID, desc:NVT_DESC);
 
 info = string("net\n\nClamAV Version (");
 info += string(version[1]);

Modified: trunk/openvas-plugins/scripts/gb_coldfusion_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_coldfusion_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/gb_coldfusion_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -51,7 +51,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100773";
+NVT_DESC = "ColdFusion Detection";
+
 port = get_http_port(default:80);
 if(!get_port_state(port))exit(0);
 
@@ -60,7 +64,7 @@
 if(http_vuln_check(port:port, url:url,pattern:"<title>ColdFusion Administrator Login</title>")) {
 
   set_kb_item(name: string("coldfusion/",port,"/installed"), value: TRUE);
-  set_kb_item(name: string("cpe:/a:adobe:coldfusion"), value: TRUE);
+  register_host_detail(name:"App", value:string("cpe:/a:adobe:coldfusion"), nvt:NVT_OID, desc:NVT_DESC);
 
   if(report_verbosity > 0) {
     security_note(port:port);

Modified: trunk/openvas-plugins/scripts/gb_collabtive_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_collabtive_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/gb_collabtive_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -54,7 +54,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100854";
+NVT_DESC = "Collabtive Detection";
+
 port = get_http_port(default:80);
 
 if(!get_port_state(port))exit(0);
@@ -106,9 +110,9 @@
     set_kb_item(name: string("www/", port, "/collabtive"), value: string(vers," under ",install));
 
     if(vers == "unknown") {
-      set_kb_item(name:string("cpe:/a:collabtive:collabtive"), value:TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:collabtive:collabtive"), nvt:NVT_OID, desc:NVT_DESC);
     } else {
-      set_kb_item(name:string("cpe:/a:collabtive:collabtive:",vers), value:TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:collabtive:collabtive:",vers), nvt:NVT_OID, desc:NVT_DESC);
     }  
 
     info = string("com/\n\nCollabtive Version '");

Modified: trunk/openvas-plugins/scripts/gb_couchdb_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_couchdb_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/gb_couchdb_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -53,7 +53,11 @@
 
 include("http_func.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100571";
+NVT_DESC = "CouchDB Detection";
+
 port = get_http_port(default:5984);
 if(!get_port_state(port))exit(0);
 
@@ -66,9 +70,9 @@
 
 if(!isnull(version[1])) {
   vers = version[1];
-  set_kb_item(name:string("cpe:/a:apache:couchdb:", vers), value: TRUE);
+  register_host_detail(name:"App", value:string("cpe:/a:apache:couchdb:", vers), nvt:NVT_OID, desc:NVT_DESC);
 } else {
-  set_kb_item(name:string("cpe:/a:apache:couchdb"), value: TRUE);
+  register_host_detail(name:"App", value:string("cpe:/a:apache:couchdb"), nvt:NVT_OID, desc:NVT_DESC);
 }  
 
 set_kb_item(name:string("couchdb/",port,"/version"), value: vers);

Modified: trunk/openvas-plugins/scripts/gb_egroupware_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_egroupware_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/gb_egroupware_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -58,7 +58,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100823";
+NVT_DESC = "EGroupware Detection";
+
 port = get_http_port(default:80);
 
 if(!get_port_state(port))exit(0);
@@ -97,9 +101,9 @@
     set_kb_item(name: string("www/", port, "/egroupware"), value: string(vers," under ",install));
 
     if(vers != "unknown") {
-      set_kb_item(name:string("cpe:/a:egroupware:egroupware:",vers), value:TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:egroupware:egroupware:",vers), nvt:NVT_OID, desc:NVT_DESC);
     } else {
-      set_kb_item(name:string("cpe:/a:egroupware:egroupware:"), value:TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:egroupware:egroupware:"), nvt:NVT_OID, desc:NVT_DESC);
     }  
 
     info = string("/\n\nEGroupware Version '");

Modified: trunk/openvas-plugins/scripts/gb_emc_networker_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_emc_networker_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/gb_emc_networker_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -50,7 +50,11 @@
 }
 
 include("misc_func.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.103123";
+NVT_DESC = "EMC Networker Detection";
+
 port = 7938;
 if(!get_port_state(port))exit(0);
 
@@ -70,7 +74,7 @@
 if (hexstr(buf) =~ "^8000001c") {
 
   set_kb_item (name:"emc_networker/port", value:port);
-  set_kb_item(name:string("cpe:/a:emc:networker"), value:TRUE);
+  register_host_detail(name:"App", value:string("cpe:/a:emc:networker"), nvt:NVT_OID, desc:NVT_DESC);
   register_service(port: port, proto: "emc_networker");
   security_note(port:port);
   exit(0);

Modified: trunk/openvas-plugins/scripts/gb_exponet_cms_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_exponet_cms_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/gb_exponet_cms_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -54,7 +54,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100937";
+NVT_DESC = "Exponent CMS Detection";
+
 port = get_http_port(default:80);
 
 if(!get_port_state(port))exit(0);
@@ -87,9 +91,9 @@
     set_kb_item(name: string("www/", port, "/exponent"), value: string(vers," under ",install));
 
     if(vers == "unknown") {
-      set_kb_item(name:string("cpe:/a:oicgroup:exponent_cms"), value:TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:oicgroup:exponent_cms"), nvt:NVT_OID, desc:NVT_DESC);
     } else {
-      set_kb_item(name:string("cpe:/a:oicgroup:exponent_cms:",vers), value:TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:oicgroup:exponent_cms:",vers), nvt:NVT_OID, desc:NVT_DESC);
     }  
 
     info = string("org\n\nExponent CMS Version '");

Modified: trunk/openvas-plugins/scripts/gb_freenas_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_freenas_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/gb_freenas_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -55,7 +55,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100911";
+NVT_DESC = "FreeNAS Detection";
+
 port = get_http_port(default:80);
 
 if(!get_port_state(port))exit(0);
@@ -97,9 +101,9 @@
     set_kb_item(name: string("www/", port, "/freenas"), value: string(vers," under ",install));
 
     if(vers == "unknown") {
-      set_kb_item(name: string("cpe:/a:freenas:freenas"), value:TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:freenas:freenas"), nvt:NVT_OID, desc:NVT_DESC);
     } else {
-      set_kb_item(name: string("cpe:/a:freenas:freenas:",vers), value:TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:freenas:freenas:",vers), nvt:NVT_OID, desc:NVT_DESC);
     }  
 
     info = string("org/\n\nFreeNAS Version '");

Modified: trunk/openvas-plugins/scripts/gb_freepbx_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_freepbx_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/gb_freepbx_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -56,7 +56,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100889";
+NVT_DESC = "FreePBX Detection";
+
 port = get_http_port(default:80);
 
 if(!get_port_state(port))exit(0);
@@ -97,9 +101,9 @@
     set_kb_item(name: string("www/", port, "/freepbx"), value: string(vers," under ",install));
 
     if(vers == "unknown") {
-      set_kb_item(name:string("cpe:/a:freepbx:freepbx"),value:TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:freepbx:freepbx"), nvt:NVT_OID, desc:NVT_DESC);
     } else {
-      set_kb_item(name:string("cpe:/a:freepbx:freepbx:",vers),value:TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:freepbx:freepbx:",vers), nvt:NVT_OID, desc:NVT_DESC);
     }  
 
     info = string("org/\n\nFreePBX Version '");

Modified: trunk/openvas-plugins/scripts/gb_fsecure_internet_gatekeeper_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_fsecure_internet_gatekeeper_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/gb_fsecure_internet_gatekeeper_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -52,7 +52,11 @@
 include("http_keepalive.inc");
 include("global_settings.inc");
 include("url_func.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.103081";
+NVT_DESC = "F-Secure Internet Gatekeeper Detection";
+
 port = get_http_port(default:9012);
 if(!get_port_state(port))exit(0);
 
@@ -125,9 +129,9 @@
 
    set_kb_item(name: string("www/", port, "/f_secure_internet_gatekeeper"), value: string(vers," under ",install));
    if(vers == "unknown") {
-     set_kb_item(name:string("cpe:/a:f-secure:internet_gatekeeper:unknown::linux"), value:TRUE); 
+     register_host_detail(name:"App", value:string("cpe:/a:f-secure:internet_gatekeeper:unknown::linux"), nvt:NVT_OID, desc:NVT_DESC);
    } else {
-     set_kb_item(name:string("cpe:/a:f-secure:internet_gatekeeper:",vers,"::linux"), value:TRUE);
+     register_host_detail(name:"App", value:string("cpe:/a:f-secure:internet_gatekeeper:",vers,"::linux"), nvt:NVT_OID, desc:NVT_DESC);
    }  
 
 

Modified: trunk/openvas-plugins/scripts/gb_greenbone_os_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_greenbone_os_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/gb_greenbone_os_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -55,7 +55,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc"); 
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.103220";
+NVT_DESC = "Greenbone GSM Detection";
+
 function check_http() {
 
   local_var port, vers, version, info;
@@ -128,7 +132,7 @@
   local_var version;    
 
   set_kb_item(name: string("greenbone/G_OS"), value: version);
-  set_kb_item(name: string("cpe:/o:greenbone:greenbone_os:",version), value: TRUE);
+  register_host_detail(name:"App", value:string("cpe:/o:greenbone:greenbone_os:",version), nvt:NVT_OID, desc:NVT_DESC);
 
   info = string(".html\n\nThis GSM is running Greenbone OS '");
   info += string(vers);

Modified: trunk/openvas-plugins/scripts/gb_groupoffice_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_groupoffice_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/gb_groupoffice_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -56,7 +56,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100801";
+NVT_DESC = "Group-Office Detection";
+
 port = get_http_port(default:80);
 
 if(!get_port_state(port))exit(0);
@@ -90,9 +94,9 @@
     set_kb_item(name: string("www/", port, "/groupoffice"), value: string(vers," under ",install));
 
     if(vers >!< "unknown") {
-      set_kb_item(name:string("cpe:/a:group-office:group-office_groupware:",vers),value:TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:group-office:group-office_groupware:",vers), nvt:NVT_OID, desc:NVT_DESC);
     } else {
-      set_kb_item(name:string("cpe:/a:group-office:group-office_groupware"),value:TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:group-office:group-office_groupware"), nvt:NVT_OID, desc:NVT_DESC);
     }  
 
     info = string("com\n\nGroup-Office Version '");

Modified: trunk/openvas-plugins/scripts/gb_hp_performance_insight_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_hp_performance_insight_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/gb_hp_performance_insight_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -55,7 +55,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.103059";
+NVT_DESC = "HP Performance Insight Detection";
+
 port = get_http_port(default:8080);
 
 if(!get_port_state(port))exit(0);
@@ -79,9 +83,9 @@
 
     set_kb_item(name: string("www/", port, "/hp_openview_insight"), value: string(vers," under ",install));
     if(vers == "unknown") {
-      set_kb_item(name:string("cpe:/a:hp:openview_performance_insight"),value:TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:hp:openview_performance_insight"), nvt:NVT_OID, desc:NVT_DESC);
     } else {
-      set_kb_item(name:string("cpe:/a:hp:openview_performance_insight:",vers),value:TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:hp:openview_performance_insight:",vers), nvt:NVT_OID, desc:NVT_DESC);
     }  
 
     info = string("0__\n\nHP OpenView Performance Insight Version '");

Modified: trunk/openvas-plugins/scripts/gb_ibm_soliddb_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_ibm_soliddb_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/gb_ibm_soliddb_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -54,7 +54,11 @@
 include("byte_func.inc");
 include("misc_func.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100721";
+NVT_DESC = "SolidDB Detection";
+
 port = get_unknown_svc(1315);
 if(!port)port = 1315;
 
@@ -121,10 +125,10 @@
    }   
 
    if(vers == "unknown") {
-     set_kb_item(name:string("cpe:/a:ibm:soliddb"), value: TRUE);
+     register_host_detail(name:"App", value:string("cpe:/a:ibm:soliddb"), nvt:NVT_OID, desc:NVT_DESC);
    } else {
      default_credentials = TRUE;
-     set_kb_item(name:string("cpe:/a:ibm:soliddb:",vers), value: TRUE);
+     register_host_detail(name:"App", value:string("cpe:/a:ibm:soliddb:",vers), nvt:NVT_OID, desc:NVT_DESC);
      set_kb_item(name:string("soliddb/",port,"/version"), value: vers);
      desc += string("\n\nSolidDB version '",vers,"' was detected on the remote host.\n");
    }

Modified: trunk/openvas-plugins/scripts/gb_ibm_websphere_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_ibm_websphere_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/gb_ibm_websphere_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -52,7 +52,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100564";
+NVT_DESC = "IBM WebSphere Application Server Detection";
+
 port = get_http_port(default:80);
 if(!get_port_state(port))exit(0);
 
@@ -73,9 +77,9 @@
 
   if(!isnull(version[1])) {
     vers = version[1];
-    set_kb_item(name:string("cpe:/a:ibm:websphere_application_server:",vers), value: TRUE);
+    register_host_detail(name:"App", value:string("cpe:/a:ibm:websphere_application_server:",vers), nvt:NVT_OID, desc:NVT_DESC);
   } else {
-    set_kb_item(name:string("cpe:/a:ibm:websphere_application_server"), value: TRUE);
+    register_host_detail(name:"App", value:string("cpe:/a:ibm:websphere_application_server"), nvt:NVT_OID, desc:NVT_DESC);
   }  
 
   set_kb_item(name:string("www/",port,"/websphere_application_server"), value: vers);

Modified: trunk/openvas-plugins/scripts/gb_informix_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_informix_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/gb_informix_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -51,7 +51,11 @@
 
 include("misc_func.inc");
 include("byte_func.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100517";
+NVT_DESC = "Informix Detection";
+
 port = get_kb_item("Services/unknown");
 if(!port)port=9088;
 
@@ -115,7 +119,7 @@
     if(strlen(buf) && strlen(buf) == getword(blob:buf, pos:0) && "IEEEI" >< buf && "lsrvinfx" >< buf) {
  
       register_service(port:port, proto:"informix", ipproto:"tcp");
-      set_kb_item(name:string("cpe:/a:ibm:informix_dynamic_server"), value: TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:ibm:informix_dynamic_server"), nvt:NVT_OID, desc:NVT_DESC);
 
       info = string("None\n\nHere is the gathered data:\n\n");
 

Modified: trunk/openvas-plugins/scripts/gb_ingate_firewall_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_ingate_firewall_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/gb_ingate_firewall_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -49,6 +49,12 @@
  exit(0);
 }
 
+include("host_details.inc");
+
+NVT_OID = "1.3.6.1.4.1.25623.1.0.103207";
+NVT_DESC = "inGate Firewall Detection";
+
+
 port = get_kb_item("Services/udp/sip");
 if (!port) port = 5060;
 if(!(get_udp_port_state(port)))exit(0);
@@ -64,9 +70,9 @@
 set_kb_item(name:string(port,"/Ingate_Firewall"),value:vers);
 
 if(vers == "unknown") {
-  set_kb_item(name:string("cpe:/h:ingate:ingate_firewall"),value:TRUE);
+  register_host_detail(name:"App", value:string("cpe:/h:ingate:ingate_firewall"), nvt:NVT_OID, desc:NVT_DESC);
 } else {
-  set_kb_item(name:string("cpe:/h:ingate:ingate_firewall:",vers),value:TRUE);
+  register_host_detail(name:"App", value:string("cpe:/h:ingate:ingate_firewall:",vers), nvt:NVT_OID, desc:NVT_DESC);
 }
 
 desc = string(desc,"\n\ninGate Firewall version '",vers,"' was detected.\n");

Modified: trunk/openvas-plugins/scripts/gb_ingate_siparator_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_ingate_siparator_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/gb_ingate_siparator_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -53,7 +53,11 @@
 
 include("http_func.inc");
 include("http_keepalive.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.103206";
+NVT_DESC = "inGate SIParator Detection";
+
 port = get_http_port(default:80);
 if(!get_port_state(port))exit(0);
 
@@ -69,9 +73,9 @@
 set_kb_item(name:string(port,"/Ingate_SIParator"),value:vers);
 
 if(vers == "unknown") {
-  set_kb_item(name:string("cpe:/h:ingate:siparator"),value:TRUE);
+  register_host_detail(name:"App", value:string("cpe:/h:ingate:siparator"), nvt:NVT_OID, desc:NVT_DESC);
 } else {
-  set_kb_item(name:string("cpe:/h:ingate:siparator:",vers),value:TRUE);
+  register_host_detail(name:"App", value:string("cpe:/h:ingate:siparator:",vers), nvt:NVT_OID, desc:NVT_DESC);
 }  
 
 desc = string(desc,"\n\ninGate SIParator version '",vers,"' was detected.\n");

Modified: trunk/openvas-plugins/scripts/gb_interchange_web_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_interchange_web_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/gb_interchange_web_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -56,7 +56,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100552";
+NVT_DESC = "Interchange Detection";
+
 port = get_http_port(default:80);
 
 if(!get_port_state(port))exit(0);
@@ -84,9 +88,9 @@
 
     if ( !isnull(version[1]) ) {
        vers=chomp(version[1]);
-       set_kb_item(name:string("cpe:/a:icdevgroup:interchange:", vers), value:TRUE);
+       register_host_detail(name:"App", value:string("cpe:/a:icdevgroup:interchange:", vers), nvt:NVT_OID, desc:NVT_DESC);
     } else {
-       set_kb_item(name:string("cpe:/a:icdevgroup:interchange"), value:TRUE);
+       register_host_detail(name:"App", value:string("cpe:/a:icdevgroup:interchange"), nvt:NVT_OID, desc:NVT_DESC);
     }  
 
     set_kb_item(name: string("www/", port, "/interchange"), value: string(vers," under ",install));

Modified: trunk/openvas-plugins/scripts/gb_ldap_account_manager_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_ldap_account_manager_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/gb_ldap_account_manager_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -56,7 +56,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.103158";
+NVT_DESC = "LDAP Account Manager Detection";
+
 port = get_http_port(default:80);
 
 if(!get_port_state(port))exit(0);
@@ -91,9 +95,9 @@
     set_kb_item(name: string("www/", port, "/ldap_account_manager"), value: string(vers," under ",install));
 
     if(vers == "unknown") {
-      set_kb_item(name:string("cpe:/a:ldap_account_manager:ldap_account_manager"), value:TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:ldap_account_manager:ldap_account_manager"), nvt:NVT_OID, desc:NVT_DESC);
     } else {
-      set_kb_item(name:string("cpe:/a:ldap_account_manager:ldap_account_manager:",vers), value:TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:ldap_account_manager:ldap_account_manager:",vers), nvt:NVT_OID, desc:NVT_DESC);
     }  
 
     info = string("org/\n\nLDAP Account Manager Version '");

Modified: trunk/openvas-plugins/scripts/gb_lotus_domino_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_lotus_domino_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/gb_lotus_domino_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -61,7 +61,11 @@
 include("imap_func.inc");
 include("pop3_func.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100597";
+NVT_DESC = "Lotus Domino Detection";
+
 domino_ver = FALSE;
 
 port = get_kb_item("Services/smtp");
@@ -111,7 +115,7 @@
 
 if(domino_ver) {
 
-  set_kb_item(name:string("cpe:/a:lotus:domino_server:", domino_ver), value: TRUE);
+  register_host_detail(name:"App", value:string("cpe:/a:lotus:domino_server:", domino_ver), nvt:NVT_OID, desc:NVT_DESC);
   set_kb_item(name:string("Domino/Port/"), value:port);
   set_kb_item(name:string("Domino/Version"),value: domino_ver);
 

Modified: trunk/openvas-plugins/scripts/gb_nuralstorm_webmail_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_nuralstorm_webmail_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/gb_nuralstorm_webmail_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -53,7 +53,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100742";
+NVT_DESC = "Nuralstorm Webmail Detection";
+
 port = get_http_port(default:80);
 
 if(!get_port_state(port))exit(0);
@@ -83,9 +87,9 @@
     if ( !isnull(version[1]) ) {
        vers = str_replace(string: version[1],find:" ", replace:"");
        vers=chomp(vers);
-       set_kb_item(name:string("cpe:/a:nuralstorm:nuralstorm_webmail:",vers), value:TRUE);
+       register_host_detail(name:"App", value:string("cpe:/a:nuralstorm:nuralstorm_webmail:",vers), nvt:NVT_OID, desc:NVT_DESC);
     } else {
-       set_kb_item(name:string("cpe:/a:nuralstorm:nuralstorm_webmail"), value:TRUE);
+       register_host_detail(name:"App", value:string("cpe:/a:nuralstorm:nuralstorm_webmail"), nvt:NVT_OID, desc:NVT_DESC);
     }  
 
     set_kb_item(name: string("www/", port, "/nuralstorm_webmail"), value: string(vers," under ",install));

Modified: trunk/openvas-plugins/scripts/gb_openemr_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_openemr_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/gb_openemr_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -56,7 +56,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.103018";
+NVT_DESC = "OpenEMR Detection";
+
 port = get_http_port(default:80);
 
 if(!get_port_state(port))exit(0);
@@ -90,9 +94,9 @@
     set_kb_item(name: string("www/", port, "/OpenEMR"), value: string(vers," under ",install));
 
     if(vers == "unknown") {
-      set_kb_item(name:string("cpe:/a:openemr:openemr"),value:TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:openemr:openemr"), nvt:NVT_OID, desc:NVT_DESC);
     } else {
-      set_kb_item(name:string("cpe:/a:openemr:openemr:",vers),value:TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:openemr:openemr:",vers), nvt:NVT_OID, desc:NVT_DESC);
     }  
 
     info = string("org/\n\nOpenEMR Version '");

Modified: trunk/openvas-plugins/scripts/gb_openengine_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_openengine_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/gb_openengine_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -53,7 +53,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100845";
+NVT_DESC = "openEngine Detection";
+
 port = get_http_port(default:80);
 
 if(!get_port_state(port))exit(0);
@@ -87,9 +91,9 @@
 
     set_kb_item(name: string("www/", port, "/openengine"), value: string(vers," under ",install));
     if(vers == "unknown") {
-      set_kb_item(name:string("cpe:/a:openengine:openengine"), value:TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:openengine:openengine"), nvt:NVT_OID, desc:NVT_DESC);
     } else { 
-      set_kb_item(name:string("cpe:/a:openengine:openengine:",vers), value:TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:openengine:openengine:",vers), nvt:NVT_OID, desc:NVT_DESC);
     }
 
     info = string("dee\n\nopenEngine Version '");

Modified: trunk/openvas-plugins/scripts/gb_orangehrm_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_orangehrm_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/gb_orangehrm_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -54,7 +54,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100850";
+NVT_DESC = "OrangeHRM Detection";
+
 port = get_http_port(default:80);
 
 if(!get_port_state(port))exit(0);
@@ -88,9 +92,9 @@
     set_kb_item(name: string("www/", port, "/orangehrm"), value: string(vers," under ",install));
 
     if(vers == "unknown") {
-      set_kb_item(name:string("cpe:/a:orangehrm:orangehrm"), value:TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:orangehrm:orangehrm"), nvt:NVT_OID, desc:NVT_DESC);
     } else {
-      set_kb_item(name:string("cpe:/a:orangehrm:orangehrm:",vers), value:TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:orangehrm:orangehrm:",vers), nvt:NVT_OID, desc:NVT_DESC);
     }  
 
     info = string("com/\n\nOrangeHRM Version '");

Modified: trunk/openvas-plugins/scripts/gb_ossim_web_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_ossim_web_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/gb_ossim_web_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -59,7 +59,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100543";
+NVT_DESC = "OSSIM Detection";
+
 port = get_http_port(default:80);
 
 if(!get_port_state(port))exit(0);
@@ -86,7 +90,7 @@
     vers = string("unknown");
 
     set_kb_item(name: string("www/", port, "/ossim"), value: string(vers," under ",install));
-    set_kb_item(name: string("cpe:/a:open_source_security_information_management:os-sim"), value:TRUE);
+    register_host_detail(name:"App", value:string("cpe:/a:open_source_security_information_management:os-sim"), nvt:NVT_OID, desc:NVT_DESC);
 
     info = string("None\n\nOSSIM was detected on the remote host in the following directory:\n\n");
     info += string(install, "\n");

Modified: trunk/openvas-plugins/scripts/gb_particle_wiki_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_particle_wiki_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/gb_particle_wiki_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -53,7 +53,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100836";
+NVT_DESC = "Particle Wiki Detection";
+
 port = get_http_port(default:80);
 
 if(!get_port_state(port))exit(0);
@@ -87,9 +91,9 @@
     set_kb_item(name: string("www/", port, "/particle_wiki"), value: string(vers," under ",install));
 
     if(vers == "unknown") {
-      set_kb_item(name:string("cpe:/a:particle_soft:particle_wiki"),value:TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:particle_soft:particle_wiki"), nvt:NVT_OID, desc:NVT_DESC);
     } else {
-      set_kb_item(name:string("cpe:/a:particle_soft:particle_wiki:",vers),value:TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:particle_soft:particle_wiki:",vers), nvt:NVT_OID, desc:NVT_DESC);
     }  
 
     info = string("/\n\nParticle Version '");

Modified: trunk/openvas-plugins/scripts/gb_php_support_tickets_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_php_support_tickets_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/gb_php_support_tickets_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -55,7 +55,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.103255";
+NVT_DESC = "PHP Support Tickets Detection";
+
 port = get_http_port(default:80);
 
 if(!get_port_state(port))exit(0);
@@ -90,9 +94,9 @@
     set_kb_item(name: string("www/", port, "/php_support_tickets"), value: string(vers," under ",install));
 
     if(vers == "unknown") {
-      set_kb_item(name:string("cpe:/a:triangle_solutions:php_support_tickets"), value:TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:triangle_solutions:php_support_tickets"), nvt:NVT_OID, desc:NVT_DESC);
     }  else {
-      set_kb_item(name:string("cpe:/a:triangle_solutions:php_support_tickets:",vers), value:TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:triangle_solutions:php_support_tickets:",vers), nvt:NVT_OID, desc:NVT_DESC);
     }  
 
     info = string("com/\n\nPHP Support Tickets Version '");

Modified: trunk/openvas-plugins/scripts/gb_phplist_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_phplist_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/gb_phplist_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -54,7 +54,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.103230";
+NVT_DESC = "phpList Detection";
+
 port = get_http_port(default:80);
 
 if(!get_port_state(port))exit(0);
@@ -89,9 +93,9 @@
     set_kb_item(name: string("www/", port, "/phpList"), value: string(vers," under ",install));
 
     if(vers == "unknown")
-      set_kb_item(name:string("cpe:/a:tincan:phplist"),value:TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:tincan:phplist"), nvt:NVT_OID, desc:NVT_DESC);
     else   
-      set_kb_item(name:string("cpe:/a:tincan:phplist:",vers),value:TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:tincan:phplist:",vers), nvt:NVT_OID, desc:NVT_DESC);
 
     info = string("com/\n\nphpList Version '");
     info += string(vers);

Modified: trunk/openvas-plugins/scripts/gb_sap_maxdb_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_sap_maxdb_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/gb_sap_maxdb_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -52,7 +52,11 @@
 
 include("misc_func.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100540";
+NVT_DESC = "SAP MaxDB Detection";
+
 port = get_kb_item("Services/unknown");
 if(!port)port=7210;
 
@@ -116,9 +120,9 @@
     }
 
      if(version) {
-       set_kb_item(name: string("cpe:/a:sap:maxdb:",version), value: TRUE);
+       register_host_detail(name:"App", value:string("cpe:/a:sap:maxdb:",version), nvt:NVT_OID, desc:NVT_DESC);
      } else {
-       set_kb_item(name: string("cpe:/a:sap:maxdb"), value: TRUE);
+       register_host_detail(name:"App", value:string("cpe:/a:sap:maxdb"), nvt:NVT_OID, desc:NVT_DESC);
      }
 
      if(info) {

Modified: trunk/openvas-plugins/scripts/gb_sawmill_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_sawmill_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/gb_sawmill_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -53,7 +53,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100867";
+NVT_DESC = "Sawmill Detection";
+
 port = get_http_port(default:8988);
 
 if(!get_port_state(port))exit(0);
@@ -69,7 +73,7 @@
 }
 
 set_kb_item(name: string("www/", port, "/sawmill"), value:string(vers));
-set_kb_item(name:string("cpe:/a:sawmill:sawmill:",vers),value:TRUE);
+register_host_detail(name:"App", value:string("cpe:/a:sawmill:sawmill:",vers), nvt:NVT_OID, desc:NVT_DESC);
 
 info = string("net\n\nSawmill Version '");
 info += string(vers);

Modified: trunk/openvas-plugins/scripts/gb_splunk_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_splunk_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/gb_splunk_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -56,7 +56,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100693";
+NVT_DESC = "Splunk Detection";
+
 port = get_http_port(default:8000);
 
 if(!get_port_state(port))exit(0);
@@ -86,9 +90,9 @@
   set_kb_item(name: string("www/", port, "/splunk"), value: string(vers));
 
   if(vers != "unknown") {
-    set_kb_item(name: string("cpe:/a:splunk:splunk:",vers), value: TRUE);
+    register_host_detail(name:"App", value:string("cpe:/a:splunk:splunk:",vers), nvt:NVT_OID, desc:NVT_DESC);
   } else {
-    set_kb_item(name: string("cpe:/a:splunk:splunk"), value: TRUE);
+    register_host_detail(name:"App", value:string("cpe:/a:splunk:splunk"), nvt:NVT_OID, desc:NVT_DESC);
   }  
 
   if(!isnull(build)) {

Modified: trunk/openvas-plugins/scripts/gb_vtiger_crm_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_vtiger_crm_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/gb_vtiger_crm_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -56,7 +56,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100909";
+NVT_DESC = "vtiger CRM Detection";
+
 port = get_http_port(default:80);
 
 if(!get_port_state(port))exit(0);
@@ -90,9 +94,9 @@
     set_kb_item(name: string("www/", port, "/vtiger_crm"), value: string(vers," under ",install));
 
     if(vers == "unknown") {
-      set_kb_item(name:string("cpe:/a:vtiger:vtiger_crm"),value:TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:vtiger:vtiger_crm"), nvt:NVT_OID, desc:NVT_DESC);
     } else {
-      set_kb_item(name:string("cpe:/a:vtiger:vtiger_crm:",vers),value:TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:vtiger:vtiger_crm:",vers), nvt:NVT_OID, desc:NVT_DESC);
     }  
 
     info = string("com\n\nvtiger CRM Version '");

Modified: trunk/openvas-plugins/scripts/gb_webid_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_webid_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/gb_webid_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -55,7 +55,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100902";
+NVT_DESC = "WeBID Detection";
+
 port = get_http_port(default:80);
 
 if(!get_port_state(port))exit(0);
@@ -95,9 +99,9 @@
     set_kb_item(name: string("www/", port, "/webid"), value: string(vers," under ",install));
 
     if(vers == "unknown") {
-      set_kb_item(name:string("cpe:/a:webidsupport:webid"),value:TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:webidsupport:webid"), nvt:NVT_OID, desc:NVT_DESC);
     } else {
-      set_kb_item(name:string("cpe:/a:webidsupport:webid:",vers),value:TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:webidsupport:webid:",vers), nvt:NVT_OID, desc:NVT_DESC);
     }  
 
     info = string("com/\n\n Version '");

Modified: trunk/openvas-plugins/scripts/hp_power_manager_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/hp_power_manager_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/hp_power_manager_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -56,7 +56,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100456";
+NVT_DESC = "HP Power Manager Detection";
+
 port = get_http_port(default:80);
 if(!get_port_state(port))exit(0);
 
@@ -84,10 +88,10 @@
         vers=chomp(version[1]);
       }
 
-     set_kb_item(name: string("cpe:/a:hp:power_manager:", vers), value: TRUE);
+     register_host_detail(name:"App", value:string("cpe:/a:hp:power_manager:", vers), nvt:NVT_OID, desc:NVT_DESC);
     
     } else {
-       set_kb_item(name: string("cpe:/a:hp:power_manager"), value: TRUE);
+       register_host_detail(name:"App", value:string("cpe:/a:hp:power_manager"), nvt:NVT_OID, desc:NVT_DESC);
     }  
 
     set_kb_item(name: string("www/", port, "/hp_power_manager"), value: string(vers));

Modified: trunk/openvas-plugins/scripts/mt_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/mt_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/mt_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -57,7 +57,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100429";
+NVT_DESC = "Movable Type Detection";
+
 port = get_http_port(default:80);
 
 if(!get_port_state(port))exit(0);
@@ -85,9 +89,9 @@
 
     if ( !isnull(version[1]) ) {
        vers=chomp(version[1]);
-       set_kb_item(name: string("cpe:/a:sixapart:movable_type:",vers), value: TRUE);
+       register_host_detail(name:"App", value:string("cpe:/a:sixapart:movable_type:",vers), nvt:NVT_OID, desc:NVT_DESC);
     } else {
-       set_kb_item(name: string("cpe:/a:sixapart:movable_type"), value: TRUE);
+       register_host_detail(name:"App", value:string("cpe:/a:sixapart:movable_type"), nvt:NVT_OID, desc:NVT_DESC);
     }  
 
     set_kb_item(name: string("www/", port, "/movabletype"), value: string(vers," under ",install));

Modified: trunk/openvas-plugins/scripts/novell_imanager_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/novell_imanager_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/novell_imanager_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -56,7 +56,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100434";
+NVT_DESC = "Novell iManager Detection";
+
 port = get_http_port(default:8080);
 
 if(!get_port_state(port))exit(0);
@@ -79,9 +83,9 @@
 
     if ( !isnull(version[1]) ) {
        vers=chomp(version[1]);
-       set_kb_item(name:string("cpe:/a:novell:imanager:",vers), value: TRUE);
+       register_host_detail(name:"App", value:string("cpe:/a:novell:imanager:",vers), nvt:NVT_OID, desc:NVT_DESC);
     } else {
-       set_kb_item(name:string("cpe:/a:novell:imanager"), value: TRUE);
+       register_host_detail(name:"App", value:string("cpe:/a:novell:imanager"), nvt:NVT_OID, desc:NVT_DESC);
     }  
 
     set_kb_item(name: string("www/", port, "/imanager"), value: string(vers));

Modified: trunk/openvas-plugins/scripts/open_media_collectors_database_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/open_media_collectors_database_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/open_media_collectors_database_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -56,7 +56,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100468";
+NVT_DESC = "Open Media Collectors Database Detection";
+
 port = get_http_port(default:80);
 
 if(!get_port_state(port))exit(0);
@@ -86,9 +90,9 @@
 
     if ( !isnull(version[1]) ) {
        vers=chomp(version[1]);
-       set_kb_item(name: string("cpe:/a:opendb:opendb:", vers), value: TRUE);
+       register_host_detail(name:"App", value:string("cpe:/a:opendb:opendb:", vers), nvt:NVT_OID, desc:NVT_DESC);
     } else {
-       set_kb_item(name: string("cpe:/a:opendb:opendb"), value: TRUE);
+       register_host_detail(name:"App", value:string("cpe:/a:opendb:opendb"), nvt:NVT_OID, desc:NVT_DESC);
     }  
 
     set_kb_item(name: string("www/", port, "/opendb"), value: string(vers," under ",install));

Modified: trunk/openvas-plugins/scripts/oracle_webLogic_server_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/oracle_webLogic_server_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/oracle_webLogic_server_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -54,7 +54,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100493";
+NVT_DESC = "Oracle WebLogic Server Detection";
+
 port = get_http_port(default:7001);
 if(!get_port_state(port))exit(0);
 
@@ -86,9 +90,9 @@
    set_kb_item(name: string("www/", port, "/WebLogic_Server"), value: string(vers));
 
    if("unknown" >!< vers) {
-     set_kb_item(name: string("cpe:/a:bea:weblogic_server:",vers), value: TRUE);
+     register_host_detail(name:"App", value:string("cpe:/a:bea:weblogic_server:",vers), nvt:NVT_OID, desc:NVT_DESC);
    } else {
-     set_kb_item(name: string("cpe:/a:bea:weblogic_server"), value: TRUE);
+     register_host_detail(name:"App", value:string("cpe:/a:bea:weblogic_server"), nvt:NVT_OID, desc:NVT_DESC);
    }  
 
 

Modified: trunk/openvas-plugins/scripts/pdns_version.nasl
===================================================================
--- trunk/openvas-plugins/scripts/pdns_version.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/pdns_version.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -58,7 +58,11 @@
 }
 
 include("misc_func.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100432";
+NVT_DESC = "PowerDNS Detection";
+
  soctcp53 = 0;
  
  if(get_port_state(53))
@@ -136,9 +140,9 @@
 		num_version = eregmatch(pattern:"([0-9.]+)", string: version[1]);
 
 		if("Recursor" >< version[1]) {
- 		  set_kb_item(name:string("cpe:/a:powerdns:recursor:",num_version[1]), value: TRUE);
+     register_host_detail(name:"App", value:string("cpe:/a:powerdns:recursor:",num_version[1]), nvt:NVT_OID, desc:NVT_DESC);
 		} else {
-                  set_kb_item(name:string("cpe:/a:powerdns:powerdns:",num_version[1]), value: TRUE);
+                  register_host_detail(name:"App", value:string("cpe:/a:powerdns:powerdns:",num_version[1]), nvt:NVT_OID, desc:NVT_DESC);
 		}
 
 		security_note(port:53, data:desc, protocol:proto);

Modified: trunk/openvas-plugins/scripts/pligg_cms_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/pligg_cms_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/pligg_cms_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -55,7 +55,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100374";
+NVT_DESC = "Pligg CMS Detection";
+
 port = get_http_port(default:80);
 
 if(!get_port_state(port))exit(0);
@@ -105,9 +109,9 @@
 
     set_kb_item(name: string("www/", port, "/pligg"), value: string(vers," under ",install));
     if("unknown" >!< vers) {
-      set_kb_item(name: string("cpe:/a:pligg:pligg_cms:",vers), value: TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:pligg:pligg_cms:",vers), nvt:NVT_OID, desc:NVT_DESC);
     } else {
-      set_kb_item(name: string("cpe:/a:pligg:pligg_cms"), value: TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:pligg:pligg_cms"), nvt:NVT_OID, desc:NVT_DESC);
     }  
 
     info = string("None\n\nPligg CMS Version '");

Modified: trunk/openvas-plugins/scripts/quicksilver_forums_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/quicksilver_forums_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/quicksilver_forums_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -55,7 +55,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100503";
+NVT_DESC = "Quicksilver Forums Detection";
+
 port = get_http_port(default:80);
 
 if(!get_port_state(port))exit(0);
@@ -88,9 +92,9 @@
 
     if ( !isnull(version[1]) ) {
        vers=chomp(version[1]);
-       set_kb_item(name: string("cpe:/a:quicksilver_forums:quicksilver_forums:", vers), value: TRUE);
+       register_host_detail(name:"App", value:string("cpe:/a:quicksilver_forums:quicksilver_forums:", vers), nvt:NVT_OID, desc:NVT_DESC);
     } else {
-       set_kb_item(name: string("cpe:/a:quicksilver_forums:quicksilver_forums"), value: TRUE);
+       register_host_detail(name:"App", value:string("cpe:/a:quicksilver_forums:quicksilver_forums"), nvt:NVT_OID, desc:NVT_DESC);
     }  
 
     set_kb_item(name: string("www/", port, "/quicksilver"), value: string(vers," under ",install));

Modified: trunk/openvas-plugins/scripts/sun_dir_server_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/sun_dir_server_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/sun_dir_server_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -50,7 +50,11 @@
 include("misc_func.inc");
 include("dump.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100437";
+NVT_DESC = "Sun Java System Directory Server Detection";
+
 port = get_kb_item("Services/ldap");
 
 if(!port)exit(0);
@@ -95,7 +99,7 @@
     version = eregmatch(string:str, pattern:"Sun-Directory-Server/([0-9.]+([^#]+)?)");
     if(!isnull(version[1])) {
       set_kb_item(name:string("ldap/",port,"/SunJavaDirServer"), value:version[1]);
-      set_kb_item(name:string("cpe:/a:sun:java_system_directory_server:",version[1]), value: TRUE);      
+      register_host_detail(name:"App", value:string("cpe:/a:sun:java_system_directory_server:",version[1]), nvt:NVT_OID, desc:NVT_DESC);
       info = string("None\n\nSun Java System Directory Server Version '");
       info += string(version[1]);
       info += string("' was detected on the remote host\n");

Modified: trunk/openvas-plugins/scripts/support_incident_tracker_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/support_incident_tracker_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/support_incident_tracker_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -59,7 +59,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100466";
+NVT_DESC = "SiT! Support Incident Tracker Detection";
+
 port = get_http_port(default:80);
 
 if(!get_port_state(port))exit(0);
@@ -89,10 +93,10 @@
     if (!isnull(version[1]))
     {
       vers = ereg_replace(pattern:" |-", string:version[1], replace:".");
-      set_kb_item(name: string("cpe:/a:salford_software:support_incident_tracker:", vers), value: TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:salford_software:support_incident_tracker:", vers), nvt:NVT_OID, desc:NVT_DESC);
     } 
     else {
-      set_kb_item(name: string("cpe:/a:salford_software:support_incident_tracker"), value: TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:salford_software:support_incident_tracker"), nvt:NVT_OID, desc:NVT_DESC);
     }
     
     set_kb_item(name: string("www/", port, "/support_incident_tracker"), value: string(vers," under ",install));

Modified: trunk/openvas-plugins/scripts/testlink_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/testlink_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/testlink_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -56,7 +56,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100389";
+NVT_DESC = "TestLink Detection";
+
 port = get_http_port(default:80);
 
 if(!get_port_state(port))exit(0);
@@ -91,9 +95,9 @@
 
       set_kb_item(name: string("www/", port, "/testlink"), value: string(vers," under ",install));
       if("unknown" >!< vers) {
-        set_kb_item(name: string("cpe:/a:teamst:testlink:",vers), value: TRUE);
+        register_host_detail(name:"App", value:string("cpe:/a:teamst:testlink:",vers), nvt:NVT_OID, desc:NVT_DESC);
       } else {
-        set_kb_item(name: string("cpe:/a:teamst:testlink:"), value: TRUE);
+        register_host_detail(name:"App", value:"cpe:/a:teamst:testlink", nvt:NVT_OID, desc:NVT_DESC);
       }  
 
       info = string("None\n\nTestLink Version '");

Modified: trunk/openvas-plugins/scripts/unbound_version.nasl
===================================================================
--- trunk/openvas-plugins/scripts/unbound_version.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/unbound_version.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -59,7 +59,11 @@
 }
 
 include("misc_func.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100417";
+NVT_DESC = "Unbound DNS resolver Detection";
+
  soctcp53 = 0;
  
  if(get_port_state(53))
@@ -133,7 +137,7 @@
                        );    
 
 		set_kb_item(name:"unbound/version",value:hole_data);
-		set_kb_item(name:string("cpe:/a:unbound:unbound:",hole_data), value: TRUE);
+  register_host_detail(name:"App", value:string("cpe:/a:unbound:unbound:",hole_data), nvt:NVT_OID, desc:NVT_DESC);
 		security_note(port:53, data:desc, protocol:proto);
 		close(soc);
 		exit(0);

Modified: trunk/openvas-plugins/scripts/zabbix_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/zabbix_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/zabbix_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -52,7 +52,11 @@
 }
 
 include("misc_func.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100403";
+NVT_DESC = "ZABBIX Server Detection";
+
 port = 10051;
 if(!get_port_state(port))exit(0);
 
@@ -69,7 +73,7 @@
 
 if("ZBXD" >< buf) {
   register_service(port:port, ipproto:"tcp", proto:"zabbix_server");
-  set_kb_item(name: string("cpe:/a:zabbix:zabbix"), value: TRUE);
+  register_host_detail(name:"App", value:string("cpe:/a:zabbix:zabbix"), nvt:NVT_OID, desc:NVT_DESC);
   security_note(port:port);
   exit(0);
 }

Modified: trunk/openvas-plugins/scripts/zabbix_web_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/zabbix_web_detect.nasl	2011-09-20 11:31:33 UTC (rev 11638)
+++ trunk/openvas-plugins/scripts/zabbix_web_detect.nasl	2011-09-20 12:40:22 UTC (rev 11639)
@@ -55,7 +55,11 @@
 include("http_func.inc");
 include("http_keepalive.inc");
 include("global_settings.inc");
+include("host_details.inc");
 
+NVT_OID = "1.3.6.1.4.1.25623.1.0.100405";
+NVT_DESC = "ZABBIX Web Interface Detection";
+
 port = get_http_port(default:80);
 
 if(!get_port_state(port))exit(0);
@@ -89,11 +93,9 @@
 
     set_kb_item(name: string("www/", port, "/zabbix_client"), value: string(vers," under ",install));
     if("unknown" >!< vers) {
-      set_kb_item(name: string("cpe:/a:zabbix:zabbix:",vers), value: TRUE);
+      register_host_detail(name:"App", value:string("cpe:/a:zabbix:zabbix:",vers), nvt:NVT_OID, desc:NVT_DESC);
     } else {
-     if(!get_kb_item(string("cpe:/a:zabbix:zabbix"))) { 
-      set_kb_item (name: string("cpe:/a:zabbix:zabbix"), value: TRUE);
-     } 
+      register_host_detail(name:"App", value:string("cpe:/a:zabbix:zabbix"), nvt:NVT_OID, desc:NVT_DESC);
     }  
 
     info = string("None\n\nZabbix Version '");



More information about the Openvas-commits mailing list