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

[scm-commit@wald.intevation.org]

Author: jan
Date: 2009-04-08 13:52:42 +0200 (Wed, 08 Apr 2009)
New Revision: 3059

Modified:
   trunk/openvas-plugins/ChangeLog
   trunk/openvas-plugins/scripts/gather-package-list.nasl
   trunk/openvas-plugins/scripts/global_settings.inc
   trunk/openvas-plugins/scripts/poptop_negative_read.nasl
   trunk/openvas-plugins/scripts/scan_info.nasl
   trunk/openvas-plugins/scripts/unknown_services.nasl
Log:
* scripts/gather-package-list.nasl, scripts/unknown_services.nasl,
scripts/global_settings.inc:
Removed conditionals for NASL_LEVEL as this level
is always true for OpenVAS.

* scripts/poptop_negative_read.nasl, scripts/scan_info.nasl: Replaced
NASL_LEVEL by OPENVAS_NASL_LEVEL.




Modified: trunk/openvas-plugins/ChangeLog
===================================================================
--- trunk/openvas-plugins/ChangeLog	2009-04-08 10:09:59 UTC (rev 3058)
+++ trunk/openvas-plugins/ChangeLog	2009-04-08 11:52:42 UTC (rev 3059)
@@ -1,3 +1,13 @@
+2009-04-08  Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>
+
+	* scripts/gather-package-list.nasl, scripts/unknown_services.nasl,
+	scripts/global_settings.inc:
+	Removed conditionals for NASL_LEVEL as this level
+	is always true for OpenVAS.
+
+	* scripts/poptop_negative_read.nasl, scripts/scan_info.nasl: Replaced
+	NASL_LEVEL by OPENVAS_NASL_LEVEL.
+
 2009-04-08  Michael Meyer <mime at gmx.de>
 	* scripts/rexecd.nasl,
 	scripts/serendipity_detect.nasl:

Modified: trunk/openvas-plugins/scripts/gather-package-list.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gather-package-list.nasl	2009-04-08 10:09:59 UTC (rev 3058)
+++ trunk/openvas-plugins/scripts/gather-package-list.nasl	2009-04-08 11:52:42 UTC (rev 3059)
@@ -65,10 +65,8 @@
 }
 sock = ssh_login_or_reuse_connection();
 if(!sock) {
-    if(NASL_LEVEL>=2300){
     # Send "error" as set by ssh_funcs.
     log_message(port:port, data:get_ssh_error());
-    }
     exit(0);
 }
 

Modified: trunk/openvas-plugins/scripts/global_settings.inc
===================================================================
--- trunk/openvas-plugins/scripts/global_settings.inc	2009-04-08 10:09:59 UTC (rev 3058)
+++ trunk/openvas-plugins/scripts/global_settings.inc	2009-04-08 11:52:42 UTC (rev 3059)
@@ -78,7 +78,6 @@
 
  if (isnull(level)) level = 1;
  if (debug_level < level) return;
- if ( NASL_LEVEL < 2191 ) return;
  msg = strcat(SCRIPT_NAME, '(', get_host_ip(), '): ');
  foreach i (_FCT_ANON_ARGS) { msg = string(msg, i); }
  l = strlen(msg);
@@ -95,7 +94,6 @@
 
  if (isnull(level)) level = 1;
  if (debug_level <= 0 || log_verbosity < level) return;
- if ( NASL_LEVEL < 2191 ) return;
  msg = strcat(SCRIPT_NAME, '(', get_host_ip(), '): ');
  foreach i (_FCT_ANON_ARGS) { msg = string(msg, i); }
  l = strlen(msg);

Modified: trunk/openvas-plugins/scripts/poptop_negative_read.nasl
===================================================================
--- trunk/openvas-plugins/scripts/poptop_negative_read.nasl	2009-04-08 10:09:59 UTC (rev 3058)
+++ trunk/openvas-plugins/scripts/poptop_negative_read.nasl	2009-04-08 11:52:42 UTC (rev 3059)
@@ -59,7 +59,7 @@
 		mkdword(1) +			# Framing Capabilities
 		mkdword(1) +			# Bearer capabilities
 		mkword(0);			# Maximum channels
-pptp_vendor = mkword(NASL_LEVEL) +		# Firmware revision 
+pptp_vendor = mkword(OPENVAS_NASL_LEVEL) +		# Firmware revision 
 	      mkpad(64) +			# Hostname 
 	      mkpad(64);			# Vendor
 

Modified: trunk/openvas-plugins/scripts/scan_info.nasl
===================================================================
--- trunk/openvas-plugins/scripts/scan_info.nasl	2009-04-08 10:09:59 UTC (rev 3058)
+++ trunk/openvas-plugins/scripts/scan_info.nasl	2009-04-08 11:52:42 UTC (rev 3059)
@@ -57,7 +57,7 @@
 	if ( ! defined_func("pread") )
 		version = "NeWT";
 	else
-		version = "Unknown (NASL_LEVEL=" + NASL_LEVEL + ")";
+		version = "Unknown (OPENVAS_NASL_LEVEL=" + OPENVAS_NASL_LEVEL + ")";
 	}
  else
 	version = NESSUS_VERSION;

Modified: trunk/openvas-plugins/scripts/unknown_services.nasl
===================================================================
--- trunk/openvas-plugins/scripts/unknown_services.nasl	2009-04-08 10:09:59 UTC (rev 3058)
+++ trunk/openvas-plugins/scripts/unknown_services.nasl	2009-04-08 11:52:42 UTC (rev 3059)
@@ -68,16 +68,6 @@
    "telnet.nasl",
    "xtel_detect.nasl",
    "xtelw_detect.nasl");
-   if (NASL_LEVEL >= 3000)
-   {
-    script_dependencies (
-    "veritas_agent_detect.nasl",
-    "veritas_netbackup_vmd_detect.nasl",
-    "veritas_netbackup_detect.nasl",
-    "hp_openview_ovalarmsrv.nasl",
-    "hp_openview_ovtopmd.nasl",
-    "hp_openview_ovuispmd.nasl");
-   }
  script_require_ports("Services/unknown");
  exit(0);
 }