Land #9994, restore some SMB mixin aliases, add local definition

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

@@ -16,6 +16,12 @@ module Msf
       include Msf::Exploit::Remote::Tcp
       include Msf::Exploit::Remote::NTLM::Client
 
+      # These constants are unused here, but may be used in some code that
+      # includes this. Local definitions should be preferred.
+      SIMPLE = Rex::Proto::SMB::SimpleClient
+      XCEPT  = Rex::Proto::SMB::Exceptions
+      CONST  = Rex::Proto::SMB::Constants
+
       # Alias over the Rex DCERPC protocol modules
       DCERPCPacket   = Rex::Proto::DCERPC::Packet
       DCERPCClient   = Rex::Proto::DCERPC::Client

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

@@ -5,6 +5,8 @@ module Exploit::Remote::SMB::Client::Psexec_MS17_010
   include Msf::Exploit::Remote::SMB::Client::PipeAuditor
   include Msf::Exploit::Remote::Tcp
 
+  CONST = Rex::Proto::SMB::Constants
+
   def initialize(info = {})
     super
     register_options([