Land #6110, fix typos in exec_powershell, datstore confusion

bug/bundler_fix
Brent Cook 2015-10-20 13:10:13 -05:00
commit cb2d5a6c54
No known key found for this signature in database
GPG Key ID: 1FFAA0B24B708F96
3 changed files with 6 additions and 6 deletions

View File

@ -30,7 +30,7 @@ class RPC_Core < RPC_Base
end
# Returns a global datstore option.
# Returns a global datastore option.
#
# @param [String] var The name of the global datastore.
# @return [Hash] The global datastore option. If the option is not set, then the value is empty.

View File

@ -177,7 +177,7 @@ class Console::CommandDispatcher::Lanattacks::Dhcp
def print_dhcp_load_options_usage
print("dhcp_load_options <datastore> [-h]\n\n" +
"Load settings from a datstore to the active DHCP server.\n\n" +
"Load settings from a datastore to the active DHCP server.\n\n" +
"The datastore must be a hash of name/value pairs.\n" +
"Valid names are:\n" +
@@dhcp_set_option_valid_options.map {|o| " - #{o}\n" }.join('') +

View File

@ -30,12 +30,12 @@ class Metasploit3 < Msf::Post
register_options(
[
OptString.new( 'SCRIPT', [true, 'Path to the local PS script or command string to execute' ]),
OptString.new( 'SCRIPT', [true, 'Path to the local PS script or command string to execute']),
], self.class)
register_advanced_options(
[
OptString.new('SUBSTITUTIONS', [false, 'Script subs in gsub format - original,sub;original,sub' ]),
OptString.new('SUBSTITUTIONS', [false, 'Script subs in gsub format - original,sub;original,sub']),
], self.class)
end
@ -47,11 +47,11 @@ class Metasploit3 < Msf::Post
raise "Powershell not available" if ! have_powershell?
# Preprocess the Powershell::Script object with substitions from Exploit::Powershell
script = make_subs(read_script(datstore['SCRIPT']),process_subs(datstore['SUBSTITUTIONS']))
script = make_subs(read_script(datastore['SCRIPT']), process_subs(datastore['SUBSTITUTIONS']))
# Execute in session
print_status psh_exec(script)
print_good('Finished!')
print_good 'Finished!'
end
end