diff --git a/lib/msf/base/simple/auxiliary.rb b/lib/msf/base/simple/auxiliary.rb index b5cd6fab2c..195072800a 100644 --- a/lib/msf/base/simple/auxiliary.rb +++ b/lib/msf/base/simple/auxiliary.rb @@ -44,7 +44,7 @@ module Auxiliary # Clone the module to prevent changes to the original instance mod = omod.replicant - Msf::Simple::Framework.simplify_module(mod) + Msf::Simple::Framework.simplify_module( mod, false ) # Import options from the OptionStr or Option hash. mod._import_extra_options(opts) diff --git a/lib/msf/base/simple/exploit.rb b/lib/msf/base/simple/exploit.rb index 11802d0a35..9665438349 100644 --- a/lib/msf/base/simple/exploit.rb +++ b/lib/msf/base/simple/exploit.rb @@ -60,7 +60,7 @@ module Exploit # Clone the module to prevent changes to the original instance exploit = oexploit.replicant - Msf::Simple::Framework.simplify_module( exploit ) + Msf::Simple::Framework.simplify_module( exploit, false ) # Import options from the OptionStr or Option hash. diff --git a/lib/msf/base/simple/framework.rb b/lib/msf/base/simple/framework.rb index 27d8392938..b9d3fde778 100644 --- a/lib/msf/base/simple/framework.rb +++ b/lib/msf/base/simple/framework.rb @@ -136,12 +136,12 @@ module Framework # Simplifies a module instance if the type is supported by extending it # with the simplified module interface. # - def self.simplify_module(instance) + def self.simplify_module(instance, load_saved_config = true) if ((ModuleSimplifiers[instance.type]) and (instance.class.include?(ModuleSimplifiers[instance.type]) == false)) instance.extend(ModuleSimplifiers[instance.type]) - instance.init_simplified + instance.init_simplified(load_saved_config) end end diff --git a/lib/msf/base/simple/module.rb b/lib/msf/base/simple/module.rb index 48a9ddfac4..396d9d99c5 100644 --- a/lib/msf/base/simple/module.rb +++ b/lib/msf/base/simple/module.rb @@ -32,8 +32,8 @@ module Module # # Initializes the simplified interface. # - def init_simplified - load_config + def init_simplified(load_saved_config=true) + load_config if load_saved_config end # diff --git a/lib/msf/base/simple/post.rb b/lib/msf/base/simple/post.rb index d9c5c01647..c5174e5204 100644 --- a/lib/msf/base/simple/post.rb +++ b/lib/msf/base/simple/post.rb @@ -40,7 +40,7 @@ module Post # Clone the module to prevent changes to the original instance mod = omod.replicant - Msf::Simple::Framework.simplify_module( mod ) + Msf::Simple::Framework.simplify_module( mod, false ) # Import options from the OptionStr or Option hash. mod._import_extra_options(opts)