Merge branch 'master' of github.com:rapid7/metasploit-framework

modules/exploits/windows/oracle/tns_auth_sesskey.rb

@@ -71,6 +71,7 @@ class Metasploit3 < Msf::Exploit::Remote
 
 		register_options(
 			[
+				OptString.new('SID', [ true, 'The target database SID', 'ORCL']),
 				Opt::RPORT(1521)
 			], self.class)
 	end
@@ -125,7 +126,7 @@ class Metasploit3 < Msf::Exploit::Remote
 		connect_data = "" +
 			"(DESCRIPTION=" +
 				"(CONNECT_DATA=" +
-					"(SERVICE_NAME=orcl)" +
+					"(SERVICE_NAME=#{datastore['SID']})" +
 					"(CID=" +
 						"(PROGRAM=client.exe)" +
 						"(HOST=client_host)" +