From 6422d8c2de910d3d0a9511f1c4d2380ed281f3ac Mon Sep 17 00:00:00 2001
From: James Lee <James_Lee@rapid7.com>
Date: Thu, 9 Sep 2010 05:19:04 +0000
Subject: [PATCH] unbreak payloads over rpc

git-svn-id: file:///home/svn/framework3/trunk@10271 4d416f70-5f16-0410-b530-b9f4589650da
---
 lib/msf/core/rpc/module.rb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/msf/core/rpc/module.rb b/lib/msf/core/rpc/module.rb
index 45c3d8f55d..a9ff6cd955 100644
--- a/lib/msf/core/rpc/module.rb
+++ b/lib/msf/core/rpc/module.rb
@@ -126,7 +126,6 @@ class Module < Base
 		authenticate(token)
 
 		mod = _find_module(mtype,mname)
-		begin
 		case mtype
 			when 'exploit'
 				_run_exploit(mod, opts)
@@ -136,9 +135,6 @@ class Module < Base
 				_run_payload(mod, opts)
 		end
 
-		rescue ::Exception => e
-			$stderr.puts "#{e.class} #{e} #{e.backtrace}"
-		end
 	end
 
 protected
@@ -199,8 +195,8 @@ protected
 			})
 
 			{"result" => "success", "payload" => res.unpack("H*")[0]}
-		rescue ::Exception
-			raise ::XMLRPC::FaultException.new(500, "failed to generate")
+		rescue ::Exception => e
+			raise ::XMLRPC::FaultException.new(500, "failed to generate: #{e.message}")
 		end
 	end