[Openvas-commits] r2584 - in trunk/openvas-plugins: . extra/lsc_generator/parser scripts

[scm-commit@wald.intevation.org]

Author: chandra
Date: 2009-02-26 07:06:40 +0100 (Thu, 26 Feb 2009)
New Revision: 2584

Modified:
   trunk/openvas-plugins/ChangeLog
   trunk/openvas-plugins/extra/lsc_generator/parser/centos.py
   trunk/openvas-plugins/scripts/default_account.inc
Log:
Fixed issues

Modified: trunk/openvas-plugins/ChangeLog
===================================================================
--- trunk/openvas-plugins/ChangeLog	2009-02-26 04:27:20 UTC (rev 2583)
+++ trunk/openvas-plugins/ChangeLog	2009-02-26 06:06:40 UTC (rev 2584)
@@ -1,4 +1,12 @@
 2009-02-26 Chandrashekhar B <bchandra at secpod.com>
+	* extra/lsc_generator/parser/centos.py:
+	script filename made unique
+
+2009-02-26 Chandrashekhar B <bchandra at secpod.com>
+	* scripts/default_account.inc:
+	Fixed an issue with variable assignment
+
+2009-02-26 Chandrashekhar B <bchandra at secpod.com>
 	* scripts/secpod_noticeware_mail_server_dos_vuln.nasl,
 	scripts/secpod_jaws_cms_dir_traversal_vuln.nasl,
 	scripts/secpod_eset_remote_administrator_xss_vuln.nasl,

Modified: trunk/openvas-plugins/extra/lsc_generator/parser/centos.py
===================================================================
--- trunk/openvas-plugins/extra/lsc_generator/parser/centos.py	2009-02-26 04:27:20 UTC (rev 2583)
+++ trunk/openvas-plugins/extra/lsc_generator/parser/centos.py	2009-02-26 06:06:40 UTC (rev 2584)
@@ -492,7 +492,7 @@
         """
         Returns filename
         """
-        platform = os_map[platform]
+        platform = os_map[platform].lower()
         arch_list = ['i586', 'x86_64', 'i386', 'i686' ]
         arch = ''
 
@@ -510,9 +510,10 @@
                print "ERROR: Din't find archetecture for : ", adv_id
            fileName = "_".join([adv_id.replace(':', '_'),prod, platform])
 
-        return fileName
+        return (fileName, platform, arch)
 
 
+
     def parser(self, html_content, debug=0):
         """
         Main parser function, builds the parser object
@@ -568,12 +569,10 @@
 
             self.Summary = self.Product
 
-            self.Name = self.Product + " " + self.AdvID
-
             self.Impact = '  '
 
-            self.FileName = self.getFileName(self.AdvID, self.Product, \
-                                                  self.Platforms, debug)
+            (self.FileName, platform, arch) = self.getFileName(self.AdvID, \
+                                        self.Product, self.Platforms, debug)
 
             ## Construct File Name
             if len(self.AdvID.split('-')) == 2:
@@ -582,6 +581,10 @@
                 (name, value1, value2) = self.AdvID.split('-')
                 value = value1 + '-' + value2
 
+            ## Plugin name
+            self.Name = self.Product + " " + self.AdvID + " " + \
+                                            platform + " " + arch 
+
             ## Set XREF
             self.XREF = [name, value]
 

Modified: trunk/openvas-plugins/scripts/default_account.inc
===================================================================
--- trunk/openvas-plugins/scripts/default_account.inc	2009-02-26 04:27:20 UTC (rev 2583)
+++ trunk/openvas-plugins/scripts/default_account.inc	2009-02-26 06:06:40 UTC (rev 2584)
@@ -83,7 +83,7 @@
   soc = open_sock_tcp(port);
   if ( soc )
   {
-  ret = ssh_login(socket:soc, login:account, password:password);
+  ret = ssh_login(socket:soc, login:login, password:password);
   close(soc);
   if ( ret == 0 ) return port;
   #else return 0;