tweak target selection

the target selection actually adjust the datastore
as if a user selected the target, this prevents
a mismatch between the target and the target index

MS-2325

Author: David Maloney

lib/msf/core/exploit.rb

@@ -302,7 +302,7 @@ def initialize(info = {})
 
     self.targets = Rex::Transformer.transform(info['Targets'], Array,
         [ Target ], 'Targets')
-    self.default_target = info['DefaultTarget']
+    self.default_target = info['DefaultTarget'] || 0
     self.payload_info = info['Payload'] || {}
     self.successful = false
     self.session_count = 0
@@ -688,13 +688,11 @@ def passive?
   # default target, that one will be automatically used.
   #
   def target
-    target_idx = target_index
-
     auto_idx = auto_targeted_index
     unless auto_idx.nil?
-      target_idx = auto_idx
+      datastore['TARGET'] = auto_idx
     end
-
+    target_idx = target_index
     return (target_idx) ? targets[target_idx.to_i] : nil
   end
 

spec/file_fixtures/modules/exploits/auto_target_windows.rb

@@ -62,6 +62,8 @@ def initialize(info = {})
         ],
       'DisclosureDate' => 'Jan 01 1999'
     ))
+
+    deregister_options('RPORT')
   end
 
   def exploit