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

[scm-commit@wald.intevation.org]

Author: mime
Date: 2009-12-07 09:36:01 +0100 (Mon, 07 Dec 2009)
New Revision: 6067

Modified:
   trunk/openvas-plugins/ChangeLog
   trunk/openvas-plugins/scripts/cpe_policy.nasl
   trunk/openvas-plugins/scripts/pligg_cms_detect.nasl
Log:
Added workaround

Modified: trunk/openvas-plugins/ChangeLog
===================================================================
--- trunk/openvas-plugins/ChangeLog	2009-12-05 17:20:46 UTC (rev 6066)
+++ trunk/openvas-plugins/ChangeLog	2009-12-07 08:36:01 UTC (rev 6067)
@@ -1,3 +1,11 @@
+2009-12-07 Michael Meyer <michael.meyer at intevation.de>
+
+	* scripts/cpe_policy.nasl:
+	Added temp. workaround for gsa.
+
+	* scripts/pligg_cms_detect.nasl:
+	Changed search string.
+
 2009-12-05  Chandrashekhar B <bchandra at secpod.com>
 
 	* scripts/gb_golden_ftp_server_detect.nasl,

Modified: trunk/openvas-plugins/scripts/cpe_policy.nasl
===================================================================
--- trunk/openvas-plugins/scripts/cpe_policy.nasl	2009-12-05 17:20:46 UTC (rev 6066)
+++ trunk/openvas-plugins/scripts/cpe_policy.nasl	2009-12-07 08:36:01 UTC (rev 6067)
@@ -59,9 +59,15 @@
 
 if(!single_cpe || strlen(single_cpe) < 6) {
  cpes_list = script_get_preference_file_content("CPE List");
- if(!cpes_list)exit(0);
+ if(!cpes_list) {
+   cpes_list = script_get_preference("CPE List");
+   if(!cpes_list)exit(0);
+   sep = ";";
+ } else {
+   sep = '\n';
+ }  
  
- mycpes_split = split(cpes_list, sep:'\n', keep:0); # expecting entrys seperated by \n
+ mycpes_split = split(cpes_list, sep: sep, keep:0); 
  mycpes = make_list();
 
  i = 0;
@@ -80,7 +86,6 @@
 if(!mycpes)exit(0);
 
 running = TRUE;
-
 if(severity_upon == "present") {
   foreach cpe (keys(cpes)) {
     foreach mycpe (mycpes) { 

Modified: trunk/openvas-plugins/scripts/pligg_cms_detect.nasl
===================================================================
--- trunk/openvas-plugins/scripts/pligg_cms_detect.nasl	2009-12-05 17:20:46 UTC (rev 6066)
+++ trunk/openvas-plugins/scripts/pligg_cms_detect.nasl	2009-12-07 08:36:01 UTC (rev 6067)
@@ -69,7 +69,7 @@
  buf = http_keepalive_send_recv(port:port, data:req, bodyonly:FALSE);
  if( buf == NULL )continue;
 
- if(egrep(pattern: "Copyright 2009.*Pligg <a.*http://www.pligg.com.*Content Management System", string: buf, icase: TRUE))
+ if(egrep(pattern: "Copyright.*Pligg <a.*http://www.pligg.com.*Content Management System", string: buf, icase: TRUE))
  {
      if(strlen(dir)>0) {
         install=dir;