From 6ed9bf8430b555dcbe62daeddb2f33bd400ab5bc Mon Sep 17 00:00:00 2001
From: Trevor Rosen <Trevor_Rosen@rapid7.com>
Date: Tue, 24 Jan 2012 10:47:44 -0600
Subject: [PATCH] Fix a bunch of namespace issues

---
 lib/msf/core/db.rb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/msf/core/db.rb b/lib/msf/core/db.rb
index 1ec71b302d..6470da0d03 100644
--- a/lib/msf/core/db.rb
+++ b/lib/msf/core/db.rb
@@ -190,7 +190,7 @@ class DBManager
 	# Determines if the database is functional
 	#
 	def check
-		res = Host.find(:first)
+		res = Msm::Host.find(:first)
 	end
 
 
@@ -769,7 +769,7 @@ class DBManager
 		addr = nil
 		# Report the host so it's there for the Proc to use below
 		if opts[:host]
-			if opts[:host].kind_of? Host
+			if opts[:host].kind_of? Msm::Host
 				host = opts[:host]
 			else
 				addr = normalize_host(opts[:host])
@@ -950,7 +950,7 @@ class DBManager
 		raise ArgumentError.new("Missing required option :host") if opts[:host].nil?
 		raise ArgumentError.new("Missing required option :port") if (opts[:port].nil? and opts[:service].nil?)
 
-		if (not opts[:host].kind_of?(Host)) and (not validate_ips(opts[:host]))
+		if (not opts[:host].kind_of?(Msm::Host)) and (not validate_ips(opts[:host]))
 			raise ArgumentError.new("Invalid address or object for :host (#{opts[:host].inspect})")
 		end
 
@@ -1114,7 +1114,7 @@ class DBManager
 
 		host = nil
 		addr = nil
-		if opts[:host].kind_of? Host
+		if opts[:host].kind_of? Msm::Host
 			host = opts[:host]
 		else
 			host = report_host({:workspace => wspace, :host => opts[:host]})
@@ -1268,11 +1268,11 @@ class DBManager
 		return if not wspace # Temp fix?
 		uname  = opts.delete(:username)
 
-		if ! opts[:host].kind_of? Host and opts[:host]
+		if ! opts[:host].kind_of? Msm::Host and opts[:host]
 			opts[:host] = report_host(:workspace => wspace, :host => opts[:host])
 		end
 
-		Event.create(opts.merge(:workspace_id => wspace[:id], :username => uname))
+		Msm::Event.create(opts.merge(:workspace_id => wspace[:id], :username => uname))
 	end
 
 	#
@@ -1305,7 +1305,7 @@ class DBManager
 
 		# Report the host so it's there for the Proc to use below
 		if opts[:host]
-			if opts[:host].kind_of? Host
+			if opts[:host].kind_of? Msm::Host
 				host = opts[:host]
 			else
 				host = report_host({:workspace => wspace, :host => opts[:host]})
@@ -5224,7 +5224,7 @@ class DBManager
 	# address
 	#
 	def normalize_host(host)
-		return host if host.kind_of? Host
+		return host if host.kind_of? Msm::Host
 		norm_host = nil
 
 		if (host.kind_of? String)