From 4703278183733aae69839846bbdb20a2adaaa6f0 Mon Sep 17 00:00:00 2001
From: James Lee <egypt@metasploit.com>
Date: Tue, 19 Feb 2013 12:55:06 -0600
Subject: [PATCH] Move SMB mixins into their own directory

---
 lib/msf/core/exploit/dcerpc.rb                |  2 +-
 lib/msf/core/exploit/smb.rb                   | 18 ++-------------
 lib/msf/core/exploit/smb/authenticated.rb     | 22 +++++++++++++++++++
 lib/msf/core/exploit/{ => smb}/psexec.rb      |  5 +++--
 modules/auxiliary/admin/smb/psexec_command.rb |  4 +---
 5 files changed, 29 insertions(+), 22 deletions(-)
 create mode 100644 lib/msf/core/exploit/smb/authenticated.rb
 rename lib/msf/core/exploit/{ => smb}/psexec.rb (97%)

diff --git a/lib/msf/core/exploit/dcerpc.rb b/lib/msf/core/exploit/dcerpc.rb
index 51b11c738b..ff700984be 100644
--- a/lib/msf/core/exploit/dcerpc.rb
+++ b/lib/msf/core/exploit/dcerpc.rb
@@ -21,7 +21,7 @@ module Exploit::Remote::DCERPC
 	DCERPCPacket   = Rex::Proto::DCERPC::Packet
 	DCERPCClient   = Rex::Proto::DCERPC::Client
 	DCERPCResponse = Rex::Proto::DCERPC::Response
-	DCERPCUUID	   = Rex::Proto::DCERPC::UUID
+	DCERPCUUID     = Rex::Proto::DCERPC::UUID
 	NDR            = Rex::Encoder::NDR
 
 
diff --git a/lib/msf/core/exploit/smb.rb b/lib/msf/core/exploit/smb.rb
index f249af1ed2..6e24ea986e 100644
--- a/lib/msf/core/exploit/smb.rb
+++ b/lib/msf/core/exploit/smb.rb
@@ -4,7 +4,6 @@ require 'rex/proto/ntlm'
 require 'rex/proto/dcerpc'
 require 'rex/encoder/ndr'
 
-
 module Msf
 
 ###
@@ -18,7 +17,8 @@ module Msf
 
 module Exploit::Remote::SMB
 
-	require 'msf/core/exploit/psexec'
+	require 'msf/core/exploit/smb/authenticated'
+	require 'msf/core/exploit/smb/psexec'
 
 	include Exploit::Remote::Tcp
 	include Exploit::Remote::NTLM::Client
@@ -35,20 +35,6 @@ module Exploit::Remote::SMB
 	DCERPCUUID     = Rex::Proto::DCERPC::UUID
 	NDR            = Rex::Encoder::NDR
 
-	# Mini-mixin for making SMBUser/SMBPass/SMBDomain regular options vs advanced
-	# Included when the module needs credentials to function
-	module Authenticated
-		def initialize(info = {})
-			super
-			register_options(
-			[
-				OptString.new('SMBUser', [ false, 'The username to authenticate as', '']),
-				OptString.new('SMBPass', [ false, 'The password for the specified username', '']),
-				OptString.new('SMBDomain',  [ false, 'The Windows domain to use for authentication', 'WORKGROUP']),
-			], Msf::Exploit::Remote::SMB::Authenticated)
-		end
-	end
-
 	def initialize(info = {})
 		super
 
diff --git a/lib/msf/core/exploit/smb/authenticated.rb b/lib/msf/core/exploit/smb/authenticated.rb
new file mode 100644
index 0000000000..62bfdd4703
--- /dev/null
+++ b/lib/msf/core/exploit/smb/authenticated.rb
@@ -0,0 +1,22 @@
+# -*- coding: binary -*-
+
+module Msf
+
+# Mini-mixin for making SMBUser/SMBPass/SMBDomain regular options vs advanced
+# Included when the module needs credentials to function
+module Exploit::Remote::SMB::Authenticated
+
+	include Msf::Exploit::Remote::SMB
+
+	def initialize(info = {})
+		super
+		register_options(
+			[
+				OptString.new('SMBUser', [ false, 'The username to authenticate as', '']),
+				OptString.new('SMBPass', [ false, 'The password for the specified username', '']),
+				OptString.new('SMBDomain',  [ false, 'The Windows domain to use for authentication', 'WORKGROUP']),
+			], Msf::Exploit::Remote::SMB::Authenticated)
+	end
+end
+
+end
diff --git a/lib/msf/core/exploit/psexec.rb b/lib/msf/core/exploit/smb/psexec.rb
similarity index 97%
rename from lib/msf/core/exploit/psexec.rb
rename to lib/msf/core/exploit/smb/psexec.rb
index 58e6788695..3ba505c6cf 100644
--- a/lib/msf/core/exploit/psexec.rb
+++ b/lib/msf/core/exploit/smb/psexec.rb
@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'msf/core'
 require 'msf/core/exploit/dcerpc'
 
@@ -11,10 +12,10 @@ module Msf
 # and runing a binary.
 ####
 
-module Exploit::Remote::Psexec
+module Exploit::Remote::SMB::Psexec
 
 	include Msf::Exploit::Remote::DCERPC
-	include Msf::Exploit::Remote::SMB
+	include Msf::Exploit::Remote::SMB::Authenticated
 
 	# Retrives output from the executed command
 	#
diff --git a/modules/auxiliary/admin/smb/psexec_command.rb b/modules/auxiliary/admin/smb/psexec_command.rb
index 15e51b112e..54be82308f 100644
--- a/modules/auxiliary/admin/smb/psexec_command.rb
+++ b/modules/auxiliary/admin/smb/psexec_command.rb
@@ -5,9 +5,7 @@ require 'msf/core'
 class Metasploit3 < Msf::Auxiliary
 
 	include Msf::Exploit::Remote::DCERPC
-	include Msf::Exploit::Remote::SMB
-	include Msf::Exploit::Remote::SMB::Authenticated
-	include Msf::Exploit::Remote::Psexec
+	include Msf::Exploit::Remote::SMB::Psexec
 	include Msf::Auxiliary::Report
 	include Msf::Auxiliary::Scanner