revert the rpc.stop patch as it breaks other rpc stuff. i'll have a better fix for this later today.

git-svn-id: file:///home/svn/framework3/trunk@9890 4d416f70-5f16-0410-b530-b9f4589650da

lib/msf/core/rpc/base.rb

@@ -2,11 +2,10 @@ module Msf
 module RPC
 class Base
 
-	def initialize(framework,tokens,users,plugin)
+	def initialize(framework,tokens,users)
 		@framework = framework
 		@tokens    = tokens
 		@users     = users
-		@plugin    = plugin
 	end
 
 	def authenticate(token)

lib/msf/core/rpc/core.rb

@@ -7,11 +7,6 @@ class Core < Base
 		{ "version" => ::Msf::Framework::Version }
 	end
 
-	def stop(token)
-		authenticate(token)
-		@plugin.cleanup
-	end
-
 end
 end
 end

plugins/xmlrpc.rb

@@ -98,7 +98,7 @@ class Plugin::XMLRPC < Msf::Plugin
 		# Initialize the list of authenticated sessions
 		@tokens = {}
 
-		args = [framework,@tokens,@users,self]
+		args = [framework,@tokens,@users]
 
 		# Add handlers for every class
 		self.server.add_handler(::XMLRPC::iPIMethods("auth"),
@@ -151,6 +151,11 @@ class Plugin::XMLRPC < Msf::Plugin
 		@plugin.cleanup
 	end
 
+	def stop(token)
+		authenticate(token)
+		@plugin.cleanup
+	end
+
 end
 
 end