Land rapid7#7981, allow handler launched by the handler command to persist

Brent Cook · Brent Cook · commit bbf271f6b035 · 2017-02-28T02:38:42.000-06:00
Merge remote-tracking branch 'upstream/pr/7981' into upstream-master
diff --git a/lib/msf/ui/console/command_dispatcher/jobs.rb b/lib/msf/ui/console/command_dispatcher/jobs.rb
@@ -321,7 +321,9 @@ def cmd_handler(*args)
               'ExitOnSession'  => exit_on_session,
               'RunAsJob'       => true
             }
+
             handler.datastore.reverse_merge!(payload_datastore)
+            handler.datastore.merge!(handler_opts)
 
             # Launch our Handler and get the Job ID
             handler.exploit_simple(handler_opts)

Original file line number	Diff line number	Diff line change
`@@ -321,7 +321,9 @@ def cmd_handler(*args)`
`321`	`321`	`'ExitOnSession' => exit_on_session,`
`322`	`322`	`'RunAsJob' => true`
`323`	`323`	`}`
	`324`	`+`
`324`	`325`	`handler.datastore.reverse_merge!(payload_datastore)`
	`326`	`+ handler.datastore.merge!(handler_opts)`
`325`	`327`
`326`	`328`	`# Launch our Handler and get the Job ID`
`327`	`329`	`handler.exploit_simple(handler_opts)`