remove wait when DisablePayloadHandler was set

git-svn-id: file:///home/svn/framework3/trunk@11324 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-13 23:34:43 +00:00 · 2010-12-13 23:34:43 +00:00 · f45e03cd14
parent 0d6b2c8229
commit f45e03cd14
1 changed files with 4 additions and 1 deletions
--- a/lib/msf/core/exploit_driver.rb
+++ b/lib/msf/core/exploit_driver.rb
@ -222,7 +222,10 @@ protected

 		# Wait the payload to acquire a session if this isn't a passive-style
 		# exploit.
-		if (exploit.passive? == false or force_wait_for_session == true)
+		return if not 
+
+		if (force_wait_for_session == true) or
+			(exploit.passive? == false and exploit.handler_enabled?)
 			begin
 				self.session = payload.wait_for_session(delay)
 			rescue ::Interrupt