Fully-qualify Msf::OptionContainer references

MSP-11126

Author: limhoff-r7

lib/msf/core/module.rb

@@ -115,7 +115,7 @@ def initialize(info = {})
     self.references = Rex::Transformer.transform(module_info['References'], Array, [ SiteReference, Reference ], 'Ref')
 
     # Create and initialize the option container for this module
-    self.options = OptionContainer.new
+    self.options = Msf::OptionContainer.new
     self.options.add_options(info['Options'], self.class)
     self.options.add_advanced_options(info['AdvancedOptions'], self.class)
     self.options.add_evasion_options(info['EvasionOptions'], self.class)

lib/msf/core/module/module_info.rb

@@ -159,9 +159,9 @@ def merge_info_options(info, val, advanced = false, evasion = false)
 
     key_name = ((advanced) ? 'Advanced' : (evasion) ? 'Evasion' : '') + 'Options'
 
-    new_cont = OptionContainer.new
+    new_cont = Msf::OptionContainer.new
     new_cont.add_options(val, advanced, evasion)
-    cur_cont = OptionContainer.new
+    cur_cont = Msf::OptionContainer.new
     cur_cont.add_options(info[key_name] || [], advanced, evasion)
 
     new_cont.each_option { |name, option|