Put remaining consts in exploit mixin...

Author: pbarry-r7

lib/msf/core/exploit/mixins.rb

@@ -120,3 +120,6 @@
 
 # Fortinet
 require 'msf/core/exploit/fortinet'
+
+# Other
+require 'msf/core/exploit/windows_constants'

lib/msf/core/exploit/smb/client/psexec.rb

@@ -17,7 +17,7 @@ module Msf
 
 module Exploit::Remote::SMB::Client::Psexec
 
-  include Rex::Constants::Windows
+  include Msf::Exploit::Windows_Constants
   include Msf::Exploit::Remote::DCERPC
   include Msf::Exploit::Remote::SMB::Client::Authenticated
 

lib/rex/constants/windows.rb renamed to lib/msf/core/exploit/windows_constants.rb

@@ -1,5 +1,5 @@
-module Rex::Constants
-module Windows
+module Msf
+module Exploit::Windows_Constants
 
   ##
   #

lib/rex/proto/dcerpc/svcctl/packet.rb

@@ -9,14 +9,14 @@ module Proto::DCERPC::SVCCTL
 
   require 'windows_error'
   require 'windows_error/win32'
-  require 'rex/constants/windows'
+  require 'msf/core/exploit/windows_constants'
   NDR = Rex::Encoder::NDR
 
 
 class Client
 
   include WindowsError::Win32
-  include Rex::Constants::Windows
+  include Msf::Exploit::Windows_Constants
 
   attr_accessor :dcerpc_client