[Openvas-commits] r3169 - trunk/openvas-plugins/scripts

[scm-commit@wald.intevation.org]

Author: chandra
Date: 2009-04-23 16:25:52 +0200 (Thu, 23 Apr 2009)
New Revision: 3169

Modified:
   trunk/openvas-plugins/scripts/libpng_CB-A08-0064.nasl
   trunk/openvas-plugins/scripts/mozilla_CB-A08-0017.nasl
   trunk/openvas-plugins/scripts/openoffice_CB-A08-0068.nasl
Log:
Added ssh_login_or_reuse_connection()

Modified: trunk/openvas-plugins/scripts/libpng_CB-A08-0064.nasl
===================================================================
--- trunk/openvas-plugins/scripts/libpng_CB-A08-0064.nasl	2009-04-23 13:44:42 UTC (rev 3168)
+++ trunk/openvas-plugins/scripts/libpng_CB-A08-0064.nasl	2009-04-23 14:25:52 UTC (rev 3169)
@@ -53,8 +53,13 @@
 
 local_var sec_proto, r;
 
+sock = ssh_login_or_reuse_connection();
+if(!sock){
+  exit(0);
+}
+
 sec_proto = "libpng";
-r = find_bin(prog_name:"libpng-config");
+r = find_bin(prog_name:"libpng-config", sock:sock);
 foreach binary_name (r) {
   binary_name = chomp(binary_name);
   ver = get_bin_version(full_prog_name:binary_name, version_argv:"--version", ver_pattern:"([0-9\.]+)");

Modified: trunk/openvas-plugins/scripts/mozilla_CB-A08-0017.nasl
===================================================================
--- trunk/openvas-plugins/scripts/mozilla_CB-A08-0017.nasl	2009-04-23 13:44:42 UTC (rev 3168)
+++ trunk/openvas-plugins/scripts/mozilla_CB-A08-0017.nasl	2009-04-23 14:25:52 UTC (rev 3169)
@@ -69,7 +69,12 @@
 
 include("version_func.inc");
 
-r = find_bin(prog_name:"firefox");
+sock = ssh_login_or_reuse_connection();
+if(!sock){
+  exit(0);
+}
+
+r = find_bin(prog_name:"firefox", sock:sock);
 foreach binary_name (r) {
   binary_name = chomp(binary_name);
   ver = get_bin_version(full_prog_name:binary_name, version_argv:"--version", ver_pattern:"([0-9\.]+)");
@@ -81,7 +86,7 @@
     } 
   }
 }
-r = find_bin(prog_name:"thunderbird");
+r = find_bin(prog_name:"thunderbird", sock:sock);
 foreach binary_name (r) {
   binary_name = chomp(binary_name);
   ver = get_bin_version(full_prog_name:binary_name, version_argv:"--version", ver_pattern:"([0-9\.]+)");
@@ -93,7 +98,7 @@
     } 
   }
 }
-r = find_bin(prog_name:"seamonkey");
+r = find_bin(prog_name:"seamonkey", sock:sock);
 foreach binary_name (r) {
   binary_name = chomp(binary_name);
   ver = get_bin_version(full_prog_name:binary_name, version_argv:"--version", ver_pattern:"([0-9\.]+)");

Modified: trunk/openvas-plugins/scripts/openoffice_CB-A08-0068.nasl
===================================================================
--- trunk/openvas-plugins/scripts/openoffice_CB-A08-0068.nasl	2009-04-23 13:44:42 UTC (rev 3168)
+++ trunk/openvas-plugins/scripts/openoffice_CB-A08-0068.nasl	2009-04-23 14:25:52 UTC (rev 3169)
@@ -66,17 +66,22 @@
 
 local_var ver, sec_hole, sec_proto, garg, file_name, arg, r, i, t, l, p;
 
+sock = ssh_login_or_reuse_connection();
+if(!sock){
+  exit(0);
+}
+
 sec_hole = 0;
 sec_proto = "OpenOffice.org";
 test_version = "2.4.9310";
 ver = NULL;
 r = NULL;
 
-  l = find_file(file_name:"soffice.bin");
+  l = find_file(file_name:"soffice.bin", sock:sock);
   if( isnull(l) ) {
-    l = find_file(file_path:"/usr/lib/", file_name:"soffice.bin");
+    l = find_file(file_path:"/usr/lib/", file_name:"soffice.bin", sock:sock);
     if( isnull(l) ) {    
-      l = find_file(file_path:"/usr/lib64/", file_name:"soffice.bin");	      
+      l = find_file(file_path:"/usr/lib64/", file_name:"soffice.bin", sock:sock);
     }
   }
   if( ! isnull(l) ) {
@@ -84,7 +89,7 @@
     foreach t (l) {
       if( "soffice.bin" >< t ) {
         p = chomp(ereg_replace(string:t, pattern:"soffice.bin", replace:""));
-        if( !isnull(find_file(file_path:p, file_name:"versionrc")) ) {
+        if( !isnull(find_file(file_path:p, file_name:"versionrc", sock:sock)) ) {
           r[i++] =  p + "versionrc";
         }
       }