Merge pull request #3 from jlee-r7/scriptjunkie-migrator

Proposed changes for PrependMigrate

lib/msf/core/exploit.rb

@@ -1242,15 +1242,6 @@ def handler_enabled?
 		not datastore['DisablePayloadHandler']
 	end
 
-	#
-	# Returns the state of the PrependMigrate option
-	# See https://github.com/rapid7/metasploit-framework/pull/917
-	# for discussion.
-	#
-	def prepend_migrate?
-		!!(datastore['PrependMigrate'] && datastore['PrependMigrate'].to_s.downcase == 'true')
-	end
-
 	##
 	#
 	# Handler interaction

lib/msf/core/payload/windows.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 require 'msf/core'
-require 'msf/core/payload/windows/prependmigrate'
 
 ###
 #
@@ -12,7 +11,9 @@
 ###
 module Msf::Payload::Windows
 
-	include Msf::Payload::PrependMigrate
+	require 'msf/core/payload/windows/prepend_migrate'
+	# Provides the #prepends method
+	include Msf::Payload::Windows::PrependMigrate
 
 	#
 	# ROR hash associations for some of the exit technique routines.
@@ -25,6 +26,11 @@ module Msf::Payload::Windows
 			'none'    => 0x5DE2C5AA, # GetLastError
 		}
 
+
+	def generate
+		return prepends(super)
+	end
+
 	#
 	# This mixin is chained within payloads that target the Windows platform.
 	# It provides special variable substitution for things like EXITFUNC and