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

[scm-commit at wald.intevation.org]

Author: mattm
Date: 2012-03-08 15:13:52 +0100 (Thu, 08 Mar 2012)
New Revision: 12984

Modified:
   trunk/openvas-plugins/ChangeLog
   trunk/openvas-plugins/scripts/nmap_net/nmap_net.nasl
Log:
	* scripts/nmap_net/nmap_net.nasl: Remove the preference "UDP port scan"
	when the OpenVAS version is >= 5.rc.  Instead the C part of the NVT always
	enables UDP scanning so that the port list determines whether UDP ports
	are scanned.  For OpenVAS <= 5.beta the preference and the old behaviour
	remain.

Modified: trunk/openvas-plugins/ChangeLog
===================================================================
--- trunk/openvas-plugins/ChangeLog	2012-03-08 14:06:22 UTC (rev 12983)
+++ trunk/openvas-plugins/ChangeLog	2012-03-08 14:13:52 UTC (rev 12984)
@@ -1,5 +1,13 @@
 2012-02-08  Matthew Mundell <matthew.mundell at greenbone.net>
 
+	* scripts/nmap_net/nmap_net.nasl: Remove the preference "UDP port scan"
+	when the OpenVAS version is >= 5.rc.  Instead the C part of the NVT always
+	enables UDP scanning so that the port list determines whether UDP ports
+	are scanned.  For OpenVAS <= 5.beta the preference and the old behaviour
+	remain.
+
+2012-02-08  Matthew Mundell <matthew.mundell at greenbone.net>
+
 	* scripts/nmap.nasl: Remove the preference "UDP port scan" when the
 	OpenVAS version is >= 5.rc.  Instead always enable UDP scanning so that
 	the port list determines whether UDP ports are scanned.  For OpenVAS <=

Modified: trunk/openvas-plugins/scripts/nmap_net/nmap_net.nasl
===================================================================
--- trunk/openvas-plugins/scripts/nmap_net/nmap_net.nasl	2012-03-08 14:06:22 UTC (rev 12983)
+++ trunk/openvas-plugins/scripts/nmap_net/nmap_net.nasl	2012-03-08 14:13:52 UTC (rev 12984)
@@ -56,7 +56,13 @@
   # --- Scan techniques ---
   script_add_preference(name:"TCP scanning technique", type:"radio",
     value:"connect();SYN;ACK;FIN;Window;Maimon;Xmas tree;Null;SCTP Init;SCTP COOKIE_ECHO");
-  script_add_preference(name:"UDP port scan", type:"checkbox", value:"no");
+  # This preference has been dropped since OpenVAS 5 RC, so that port lists
+  # entirely control whether UDP is scanned.
+  split = split(OPENVAS_VERSION, sep:'.', keep:FALSE);
+  if (int(split[0]) < 5)
+	script_add_preference(name:"UDP port scan", type:"checkbox", value: "no");
+  else if ((int(split[0]) == 5) && strstr(OPENVAS_VERSION, "beta"))
+	script_add_preference(name:"UDP port scan", type:"checkbox", value: "no");
   script_add_preference(name:"Service scan", type:"checkbox", value:"no");
   script_add_preference(name:"RPC port scan", type:"checkbox", value:"no");