Merge r18160:18278 from nmap-exp/djalal/nmap-nse/ to fix NSE not honoring the exclude directive bug.

scripts/db2-das-info.nse

@@ -85,7 +85,9 @@ require "shortport"
 --
 --   Details on how to reproduce these steps with the CLI are welcome.
 
-portrule = shortport.portnumber({523}, {"tcp","udp"}, {"open", "open|filtered"})
+portrule = shortport.version_port_or_service({523}, nil,
+                                            {"tcp","udp"},
+                                            {"open", "open|filtered"})
 
 --- Extracts the server profile from an already parsed db2 packet
 --

scripts/db2-info.nse

@@ -29,7 +29,9 @@ require "db2"
 -- parseVersion was ripped from the old db2-info.nse written by Tom Sellers
 --
 
-portrule = shortport.port_or_service({50000,60000},"ibm-db2", "tcp", {"open", "open|filtered"})
+portrule = shortport.version_port_or_service({50000,60000},
+                                            "ibm-db2", "tcp",
+                                            {"open", "open|filtered"})
 
 --- Converts the prodrel server string to a version string
 --
@@ -86,4 +88,4 @@ action = function( host, port )
 	results = results .. "External Name:   " .. response.extname
 	
 	return results
-end
+end

scripts/iax2-version.nse

@@ -18,7 +18,7 @@ categories = {"version"}
 require "comm"
 require "shortport"
 
-portrule = shortport.portnumber(4569, "udp")
+portrule = shortport.version_port_or_service(4569, nil, "udp")
 
 action = function(host, port)
  	-- see http://www.cornfed.com/iax.pdf for all options.

scripts/jdwp-version.nse

@@ -17,12 +17,14 @@ categories = {"version"}
 -- 9999/tcp open  jdwp    Java Debug Wire Protocol (Reference Implementation) version 1.6 1.6.0_17
 
 require "comm"
+require "shortport"
 
 portrule = function(host, port)
         -- JDWP will close the port if there is no valid handshake within 2
 	-- seconds, Service detection's NULL probe detects it as tcpwrapped.
         return port.service == "tcpwrapped"
                and port.protocol == "tcp" and port.state == "open"
+               and not(shortport.port_is_excluded(port.number,port.protocol))
 end
 
 action = function(host, port)

scripts/pptp-version.nse

@@ -18,7 +18,7 @@ categories = {"version"}
 require "comm"
 require "shortport"
 
-portrule = shortport.portnumber(1723)
+portrule = shortport.version_port_or_service(1723)
 
 action = function(host, port)
 	-- build a PPTP Start-Control-Connection-Request packet

scripts/skypev2-version.nse

@@ -12,6 +12,7 @@ license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
 categories = {"version"}
 
 require "comm"
+require "shortport"
 
 portrule = function(host, port)
         return (port.number == 80 or port.number == 443 or
@@ -19,6 +20,7 @@ portrule = function(host, port)
                 port.service == "unknown")
                and port.protocol == "tcp" and port.state == "open"
                and port.service ~= "http" and port.service ~= "ssl/http"
+               and not(shortport.port_is_excluded(port.number,port.protocol))
 end
 
 action = function(host, port)