Fix smbdirect

Also some whitespace and a typo in output message

Author: egypt

modules/auxiliary/scanner/smb/smb_version.rb

@@ -34,6 +34,7 @@ def initialize
     )
 
     deregister_options('RPORT')
+    deregister_options('SMBDIRECT')
     @smb_port = 445
   end
 
@@ -42,7 +43,7 @@ def rport
   end
 
   def smb_direct
-    @smbdirect || datastore['SMBDirect']
+    (@smb_port == 445)
   end
 
   # Fingerprint a single host
@@ -55,10 +56,10 @@ def run_host(ip)
 
     begin
       res = smb_fingerprint()
-      
+
       #
       # Create the note hash for smb.fingerprint
-      #      
+      #
       conf = {
          :native_os => res['native_os'],
          :native_lm => res['native_lm']
@@ -82,7 +83,7 @@ def run_host(ip)
           match_conf['os.edition'] = res['edition']
         end
 
-        if res['sp'].to_s.length > 0 
+        if res['sp'].to_s.length > 0
           desc << " #{res['sp'].downcase.gsub('service pack ', 'SP')}"
           conf[:os_sp] = res['sp']
           match_conf['os.version'] = res['sp']
@@ -95,7 +96,7 @@ def run_host(ip)
         end
 
         if res['lang'].to_s.length > 0 and res['lang'] != 'Unknown'
-          desc << " (language:#{res['lang']}"
+          desc << " (language:#{res['lang']})"
           conf[:os_lang] = res['lang']
           match_conf['os.language'] = conf[:os_lang]
         end
@@ -130,7 +131,7 @@ def run_host(ip)
           :port  => rport,
           :proto => 'tcp',
           :ntype => 'fingerprint.match',
-          :data  => match_conf         
+          :data  => match_conf
         )
       else
         desc = "#{res['native_os']} (#{res['native_lm']})"