From 46f147bafa726eb27d212ec3646bddff53a48fef Mon Sep 17 00:00:00 2001
From: passbe <passbe@b87d56ec-f9c0-11de-8c8a-61c5e9addfc9>
Date: Wed, 20 Apr 2011 09:00:30 +0000
Subject: [PATCH] Fixed metasploit extension invalid configuration referencing

git-svn-id: https://beef.googlecode.com/svn/trunk@909 b87d56ec-f9c0-11de-8c8a-61c5e9addfc9
---
 config.yaml                        |  4 ++--
 extensions/metasploit/config.yaml  |  2 +-
 extensions/metasploit/rpcclient.rb | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/config.yaml b/config.yaml
index 0ca2cf951..15f573aa8 100644
--- a/config.yaml
+++ b/config.yaml
@@ -53,5 +53,5 @@ beef:
             enable: true 
         proxy:
             enable: true 
-        msf:
-            enable: false
+        metasploit:
+            enable: false 
diff --git a/extensions/metasploit/config.yaml b/extensions/metasploit/config.yaml
index dce316136..29df26722 100644
--- a/extensions/metasploit/config.yaml
+++ b/extensions/metasploit/config.yaml
@@ -6,7 +6,7 @@
 # Please note that the ServerHost parameter must have the same value of host and callback_host variables here below.
 beef:
     extension:
-        msf:
+        metasploit:
             enable: true 
             host: "10.211.55.2"
             path: "/RPC2"
diff --git a/extensions/metasploit/rpcclient.rb b/extensions/metasploit/rpcclient.rb
index bfe1a0c92..da92bab70 100644
--- a/extensions/metasploit/rpcclient.rb
+++ b/extensions/metasploit/rpcclient.rb
@@ -11,15 +11,15 @@ module Metasploit
 
 	  def initialize
 			@config = BeEF::Core::Configuration.instance
-			@enabled = (@config.get('beef.msf.enable'))
+			@enabled = (@config.get('beef.extension.metasploit.enable'))
 			
 		  return if (not @enabled)
 		  
-			host = @config.get('beef.msf.host')
-			path = @config.get('beef.msf.path')
-			port = @config.get('beef.msf.port')
-			@un = @config.get('beef.msf.user')
-			@pw = @config.get('beef.msf.pass')
+			host = @config.get('beef.extension.metasploit.host')
+			path = @config.get('beef.extension.metasploit.path')
+			port = @config.get('beef.extension.metasploit.port')
+			@un = @config.get('beef.extension.metasploit.user')
+			@pw = @config.get('beef.extension.metasploit.pass')
       @lock = false
       
 			if(not host or not path or not port or not @un or not @pw)
@@ -183,7 +183,7 @@ module Metasploit
 				uri += "http://"
 			end
 
-			uri += @config.get('beef.msf.callback_host') + ":" + opts['SRVPORT'] + "/" + opts['URIPATH']
+			uri += @config.get('beef.extension.metasploit.callback_host') + ":" + opts['SRVPORT'] + "/" + opts['URIPATH']
 
 			res['uri'] = uri
 			res