From 3741ca6eeb6f50c837d6837fe1e2b241cbf22e7c Mon Sep 17 00:00:00 2001
From: HD Moore <hd_moore@rapid7.com>
Date: Sat, 8 Nov 2008 19:44:35 +0000
Subject: [PATCH] Fixes #196. Correctly show set options in the 'O' mode

git-svn-id: file:///home/svn/framework3/trunk@5854 4d416f70-5f16-0410-b530-b9f4589650da
---
 msfcli     | 5 ++++-
 msfpayload | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/msfcli b/msfcli
index 8c4ae8fa0c..72e2426bae 100755
--- a/msfcli
+++ b/msfcli
@@ -136,14 +136,17 @@ nop     = nil
 
 if (exploit.datastore['PAYLOAD'])
 	payload = $framework.payloads.create(exploit.datastore['PAYLOAD'])
+	payload.datastore.import_options_from_s(ARGV.join('_|_'), '_|_')
 end
 
 if (exploit.datastore['ENCODER'])
 	encoder = $framework.encoders.create(exploit.datastore['ENCODER'])
+	encoder.datastore.import_options_from_s(ARGV.join('_|_'), '_|_')
 end
 
 if (exploit.datastore['NOP'])
 	nop = $framework.nops.create(exploit.datastore['NOP'])
+	nop.datastore.import_options_from_s(ARGV.join('_|_'), '_|_')
 end
 
 case mode.downcase
@@ -252,4 +255,4 @@ case mode.downcase
 		usage("Invalid mode #{mode}")
 end
 
-$stdout.puts
\ No newline at end of file
+$stdout.puts
diff --git a/msfpayload b/msfpayload
index 964e59ccf3..7c5ee8238e 100755
--- a/msfpayload
+++ b/msfpayload
@@ -143,5 +143,6 @@ if (cmd =~ /^(p|y|r|c|j|x|b)/)
 	$stdout.puts(buf)
 	
 elsif (cmd =~ /^(s|o)/)
+	payload.datastore.import_options_from_s(ARGV.join('_|_'), '_|_')
 	puts Msf::Serializer::ReadableText.dump_module(payload)
-end
\ No newline at end of file
+end