From 73e4ec709ff7a31765813b0eddaea81a3bb7e50a Mon Sep 17 00:00:00 2001 From: HD Moore Date: Mon, 25 Aug 2014 15:42:18 -0500 Subject: [PATCH] Fix smb_port and require 'recog' when no DB/MDM --- Gemfile.lock | 1 + metasploit-framework.gemspec | 2 ++ modules/auxiliary/scanner/smb/smb_version.rb | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index f6154944ff..28713d1fc9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -25,6 +25,7 @@ PATH nokogiri packetfu (= 1.1.9) railties + recog rkelly-remix (= 0.0.6) robots rubyzip (~> 1.1) diff --git a/metasploit-framework.gemspec b/metasploit-framework.gemspec index 6999c787e3..aa08224337 100644 --- a/metasploit-framework.gemspec +++ b/metasploit-framework.gemspec @@ -80,4 +80,6 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency 'sqlite3' # required for Time::TZInfo in ActiveSupport spec.add_runtime_dependency 'tzinfo' + # required for OS fingerprinting + spec.add_runtime_dependency 'recog' end diff --git a/modules/auxiliary/scanner/smb/smb_version.rb b/modules/auxiliary/scanner/smb/smb_version.rb index 0f6f07d188..44a0704ce6 100644 --- a/modules/auxiliary/scanner/smb/smb_version.rb +++ b/modules/auxiliary/scanner/smb/smb_version.rb @@ -5,7 +5,7 @@ require 'msf/core' - +require 'recog' class Metasploit3 < Msf::Auxiliary @@ -38,7 +38,7 @@ class Metasploit3 < Msf::Auxiliary end def rport - @rport || datastore['RPORT'] + @smb_port || datastore['RPORT'] end def smb_direct