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

[scm-commit@wald.intevation.org]

Author: jan
Date: 2009-10-21 20:55:22 +0200 (Wed, 21 Oct 2009)
New Revision: 5665

Modified:
   trunk/openvas-plugins/ChangeLog
   trunk/openvas-plugins/scripts/nmap.nasl
Log:
* scripts/nmap.nasl: Replaced early exit by toolcheck method.



Modified: trunk/openvas-plugins/ChangeLog
===================================================================
--- trunk/openvas-plugins/ChangeLog	2009-10-21 18:54:08 UTC (rev 5664)
+++ trunk/openvas-plugins/ChangeLog	2009-10-21 18:55:22 UTC (rev 5665)
@@ -1,3 +1,7 @@
+2009-10-21  Jan-Oliver Wagner <jan-oliver.wagner at greenbone.net>
+
+	* scripts/nmap.nasl: Replaced early exit by toolcheck method.
+
 2009-10-20  Michael Meyer <michael.meyer at intevation.de>
 
 	* scripts/cvs_detect.nasl:

Modified: trunk/openvas-plugins/scripts/nmap.nasl
===================================================================
--- trunk/openvas-plugins/scripts/nmap.nasl	2009-10-21 18:54:08 UTC (rev 5664)
+++ trunk/openvas-plugins/scripts/nmap.nasl	2009-10-21 18:55:22 UTC (rev 5665)
@@ -8,8 +8,6 @@
 # <http://www.insecure.org/nmap/>
 #
 
-if ( ! find_in_path("nmap") ) exit(0);
-
 if(description)
 {
  script_id(14259);
@@ -79,6 +77,11 @@
  exit(0);
 }
 
+# script_mandatory_keys compatibility:
+include ("toolcheck.inc");
+exit_if_not_found (toolname: "nmap");
+# end of script_mandatory_keys compatibility
+
 tmpfile = NULL;
 
 function on_exit()