Merge remote-tracking branch 'upstream/master' into bug/web-vuln-logging

Author: tasos-r7

lib/msf/base/simple/exploit.rb

@@ -63,7 +63,7 @@ def self.exploit_simple(oexploit, opts, &block)
 			exploit = oexploit.replicant
 			Msf::Simple::Framework.simplify_module( exploit, false )
 			yield(exploit) if block_given?
-		
+
 			# Import options from the OptionStr or Option hash.
 			exploit._import_extra_options(opts)
 
@@ -74,14 +74,14 @@ def self.exploit_simple(oexploit, opts, &block)
 
 			# Verify the options
 			exploit.options.validate(exploit.datastore)
-		
+
 			# Start it up
 			driver = ExploitDriver.new(exploit.framework)
 
 			# Initialize the driver instance
 			driver.exploit    = exploit
 			driver.payload    = exploit.framework.payloads.create(opts['Payload'])
-			
+
 			# Set the force wait for session flag if the caller requested force
 			# blocking.  This is so that passive exploits can be blocked on from
 			# things like the cli.
@@ -137,9 +137,9 @@ def self.exploit_simple(oexploit, opts, &block)
 
 			# Save the job identifier this exploit is running as
 			exploit.job_id  = driver.job_id
-			
+
 			# Propagate this back to the caller for console mgmt
-			oexploit.job_id = exploit.job_id			
+			oexploit.job_id = exploit.job_id
 		rescue ::Interrupt
 			exploit.error = $!
 			raise $!