Merge branch 'dns_postmods' of git://github.com/mubix/metasploit-framework into mubix-dns_postmods

Author: sinn3r

modules/post/windows/recon/resolve_hostname.rb

@@ -50,8 +50,7 @@ def resolve_hostname(hostname)
 			ip = sockaddr[4,4].unpack('N').first
 			hostip = Rex::Socket.addr_itoa(ip)
 			print_status("#{hostname} resolves to #{hostip}")
-		rescue ::Exception => e
-			print_error(e)
+		rescue Rex::Post::Meterpreter::RequestError
 			print_status('Windows 2000 and prior does not support getaddrinfo')
 		end
 

modules/post/windows/recon/resolve_ip.rb

@@ -39,7 +39,7 @@ def resolve_ip(ip)
 			memtext = client.railgun.memread(ptr2dns['return'],255)
 			host_inmem = memtext.split(ip_ino)[1].split("\00")[0]
 			print_good("#{ip} resolves to #{host_inmem}")
-		rescue ::Exception => e
+		rescue Rex::Post::Meterpreter::RequestError
 			print_error("Failed to resolve #{ip}")
 		end
 	end