mirror of
https://github.com/rapid7/metasploit-framework
synced 2024-11-12 11:52:01 +01:00
Fixes #196. Correctly show set options in the 'O' mode
git-svn-id: file:///home/svn/framework3/trunk@5854 4d416f70-5f16-0410-b530-b9f4589650da
This commit is contained in:
parent
75feaa6fab
commit
3741ca6eeb
5
msfcli
5
msfcli
@ -136,14 +136,17 @@ nop = nil
|
|||||||
|
|
||||||
if (exploit.datastore['PAYLOAD'])
|
if (exploit.datastore['PAYLOAD'])
|
||||||
payload = $framework.payloads.create(exploit.datastore['PAYLOAD'])
|
payload = $framework.payloads.create(exploit.datastore['PAYLOAD'])
|
||||||
|
payload.datastore.import_options_from_s(ARGV.join('_|_'), '_|_')
|
||||||
end
|
end
|
||||||
|
|
||||||
if (exploit.datastore['ENCODER'])
|
if (exploit.datastore['ENCODER'])
|
||||||
encoder = $framework.encoders.create(exploit.datastore['ENCODER'])
|
encoder = $framework.encoders.create(exploit.datastore['ENCODER'])
|
||||||
|
encoder.datastore.import_options_from_s(ARGV.join('_|_'), '_|_')
|
||||||
end
|
end
|
||||||
|
|
||||||
if (exploit.datastore['NOP'])
|
if (exploit.datastore['NOP'])
|
||||||
nop = $framework.nops.create(exploit.datastore['NOP'])
|
nop = $framework.nops.create(exploit.datastore['NOP'])
|
||||||
|
nop.datastore.import_options_from_s(ARGV.join('_|_'), '_|_')
|
||||||
end
|
end
|
||||||
|
|
||||||
case mode.downcase
|
case mode.downcase
|
||||||
@ -252,4 +255,4 @@ case mode.downcase
|
|||||||
usage("Invalid mode #{mode}")
|
usage("Invalid mode #{mode}")
|
||||||
end
|
end
|
||||||
|
|
||||||
$stdout.puts
|
$stdout.puts
|
||||||
|
@ -143,5 +143,6 @@ if (cmd =~ /^(p|y|r|c|j|x|b)/)
|
|||||||
$stdout.puts(buf)
|
$stdout.puts(buf)
|
||||||
|
|
||||||
elsif (cmd =~ /^(s|o)/)
|
elsif (cmd =~ /^(s|o)/)
|
||||||
|
payload.datastore.import_options_from_s(ARGV.join('_|_'), '_|_')
|
||||||
puts Msf::Serializer::ReadableText.dump_module(payload)
|
puts Msf::Serializer::ReadableText.dump_module(payload)
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user