Fixups on the Oracle/Nmap stuff. Adding back in the Scanner module, since it has some handy process mgmt functions.

git-svn-id: file:///home/svn/framework3/trunk@11960 4d416f70-5f16-0410-b530-b9f4589650da

lib/msf/core/auxiliary/nmap.rb

@@ -156,7 +156,7 @@ end
 # and combinations thereof.
 def nmap_validate_rports
 	# If there's an RPORT specified, use that instead.
-	if datastore['RPORT'] && !datastore['RPORT'].empty?
+	if datastore['RPORT'] && (datastore['RPORT'].kind_of?(Fixnum) || !datastore['RPORT'].empty?)
 		return true
 	end
 	bad_port = false

modules/auxiliary/scanner/oracle/oracle_login.rb

@@ -18,6 +18,7 @@ class Metasploit3 < Msf::Auxiliary
 	include Msf::Auxiliary::Report
 	include Msf::Auxiliary::Nmap
 	include Msf::Auxiliary::AuthBrute
+	include Msf::Auxiliary::Scanner
 
 	# Creates an instance of this module.
 	def initialize(info = {})