Fix require order issue.

Author: joevennix

lib/msf/core/payload/bsd.rb

@@ -1,5 +1,6 @@
 # -*- coding: binary -*-
 require 'msf/core'
+require 'msf/core/payload/bsd/x86'
 
 ###
 #

lib/msf/core/payload/bsd/x86.rb

@@ -4,9 +4,10 @@
 ###
 # Contains common x86 BSD code
 ###
-module Msf::Payload::Bsd::X86
+module Msf::Payload::Bsd
+module X86
 
-  def exec_payload
+  def bsd_x86_exec_payload
     cmd_str   = datastore['CMD'] || ''
     # Split the cmd string into arg chunks
     cmd_parts = Shellwords.shellsplit(cmd_str)
@@ -125,4 +126,5 @@ def handle_x86_bsd_opts(pre, app)
     end
   end
 
-end
+end
+end

modules/payloads/singles/bsd/x86/exec.rb

@@ -5,7 +5,6 @@
 
 
 require 'msf/core'
-require 'msf/core/payload/bsd/x86'
 
 
 ###
@@ -21,7 +20,7 @@ module Metasploit3
   CachedSize = 16
 
   include Msf::Payload::Single
-  include Msf::Payload::Bsd::X86
+  include Msf::Payload::Bsd
 
   def initialize(info = {})
     super(merge_info(info,

modules/payloads/singles/osx/x86/exec.rb

@@ -5,7 +5,6 @@
 
 
 require 'msf/core'
-require 'msf/core/payload/bsd/x86'
 
 ###
 #