Land rapid7#7127, Fix rapid7#6989, scanner modules printing RHOST in progress messages

Author: bwatters-r7

lib/msf/core/auxiliary/scanner.rb

@@ -31,6 +31,18 @@ def initialize(info = {})
 
 end
 
+# If a module is using the scanner mixin, technically the RHOST datastore option should be
+# disabled. Only the mixin should be setting this. See #6989
+
+def setup
+  @original_rhost = datastore['RHOST']
+  datastore['RHOST'] = nil
+end
+
+def cleanup
+  datastore['RHOST'] = @original_rhost
+end
+
 
 def check
   nmod = replicant

modules/auxiliary/scanner/ftp/ftp_version.rb

@@ -33,7 +33,7 @@ def run_host(target_host)
 
     if(banner)
       banner_sanitized = Rex::Text.to_hex_ascii(self.banner.to_s)
-      print_status("#{rhost}:#{rport} FTP Banner: '#{banner_sanitized}'")
+      print_status("FTP Banner: '#{banner_sanitized}'")
       report_service(:host => rhost, :port => rport, :name => "ftp", :info => banner_sanitized)
     end