Fix smb_port and require 'recog' when no DB/MDM

Author: HD Moore

Gemfile.lock

@@ -25,6 +25,7 @@ PATH
       nokogiri
       packetfu (= 1.1.9)
       railties
+      recog
       rkelly-remix (= 0.0.6)
       robots
       rubyzip (~> 1.1)

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

modules/auxiliary/scanner/smb/smb_version.rb

@@ -5,7 +5,7 @@
 
 
 require 'msf/core'
-
+require 'recog'
 
 class Metasploit3 < Msf::Auxiliary
 
@@ -38,7 +38,7 @@ def initialize
   end
 
   def rport
-    @rport || datastore['RPORT']
+    @smb_port || datastore['RPORT']
   end
 
   def smb_direct