Just use :mac not :host_mac

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

lib/msf/core/db.rb

@@ -254,10 +254,6 @@ class DBManager
 
 		wspace = opts.delete(:workspace) || workspace
 
-		if opts[:host_mac]
-			opts[:mac] = opts.delete(:host_mac)
-		end
-
 		unless ipv4_validator(addr)
 			raise ::ArgumentError, "Invalid IP address in report_host(): #{addr}"
 		end
@@ -337,7 +333,7 @@ class DBManager
 		return if not active
 		addr  = opts.delete(:host) || return
 		hname = opts.delete(:host_name)
-		hmac  = opts.delete(:host_mac)
+		hmac  = opts.delete(:mac)
 		host  = nil
 		wspace = opts.delete(:workspace) || workspace
 
@@ -2802,7 +2798,7 @@ class DBManager
 			else
 				yield(:address,host_data[:host]) if block
 			end
-			host_data[:host_mac] = nils_for_nulls(host.elements["mac"].text.to_s.strip)
+			host_data[:mac] = nils_for_nulls(host.elements["mac"].text.to_s.strip)
 			if host.elements["comm"].text
 				host_data[:comm] = nils_for_nulls(host.elements["comm"].text.to_s.strip)
 			end

modules/auxiliary/scanner/discovery/udp_probe.rb

@@ -250,7 +250,7 @@ class Metasploit3 < Msf::Auxiliary
 
 		report_service(
 			:host  => pkt[1],
-			:host_mac  => (maddr and maddr != '00:00:00:00:00:00') ? maddr : nil,
+			:mac   => (maddr and maddr != '00:00:00:00:00:00') ? maddr : nil,
 			:host_name => (hname) ? hname.downcase : nil,
 			:port  => pkt[2],
 			:proto => 'udp',

modules/auxiliary/scanner/discovery/udp_sweep.rb

@@ -279,7 +279,7 @@ class Metasploit3 < Msf::Auxiliary
 
 		report_service(
 			:host  => pkt[1],
-			:host_mac  => (maddr and maddr != '00:00:00:00:00:00') ? maddr : nil,
+			:mac   => (maddr and maddr != '00:00:00:00:00:00') ? maddr : nil,
 			:host_name => (hname) ? hname.downcase : nil,
 			:port  => pkt[2],
 			:proto => 'udp',

modules/auxiliary/scanner/netbios/nbname.rb

@@ -271,7 +271,7 @@ class Metasploit3 < Msf::Auxiliary
 
 			report_service(
 				:host  => addr,
-				:host_mac  => (maddr and maddr != '00:00:00:00:00:00') ? maddr : nil,
+				:mac   => (maddr and maddr != '00:00:00:00:00:00') ? maddr : nil,
 				:host_name => (hname) ? hname.downcase : nil,
 				:port  => pkt[2],
 				:proto => 'udp',

modules/auxiliary/scanner/netbios/nbname_probe.rb

@@ -257,7 +257,7 @@ class Metasploit3 < Msf::Auxiliary
 
 			report_service(
 				:host  => addr,
-				:host_mac  => (maddr and maddr != '00:00:00:00:00:00') ? maddr : nil,
+				:mac   => (maddr and maddr != '00:00:00:00:00:00') ? maddr : nil,
 				:host_name => (hname) ? hname.downcase : nil,
 				:port  => pkt[2],
 				:proto => 'udp',