From 6e0e23f5baaf31d024014da52d5e5c62444b0bc8 Mon Sep 17 00:00:00 2001 From: Tod Beardsley Date: Mon, 14 Mar 2011 22:13:57 +0000 Subject: [PATCH] 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 | 2 +- modules/auxiliary/scanner/oracle/oracle_login.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/msf/core/auxiliary/nmap.rb b/lib/msf/core/auxiliary/nmap.rb index a10a9382db..a11aa866fa 100644 --- a/lib/msf/core/auxiliary/nmap.rb +++ b/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 diff --git a/modules/auxiliary/scanner/oracle/oracle_login.rb b/modules/auxiliary/scanner/oracle/oracle_login.rb index 3224bd9d61..4b16130a49 100644 --- a/modules/auxiliary/scanner/oracle/oracle_login.rb +++ b/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 = {})