From 73972fbcf2ce001c0b465f57bc748ab3a976412c Mon Sep 17 00:00:00 2001
From: Patrick J Cherry <patrick@bytemark.co.uk>
Date: Fri, 23 Nov 2012 10:49:11 +0000
Subject: Minimal DNS now also extends to resolution of items in the source
 lists too, as well as the hostname/IP being queried.

---
 lib/mauve/source_list.rb | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

(limited to 'lib')

diff --git a/lib/mauve/source_list.rb b/lib/mauve/source_list.rb
index 869d99a..d1eafc6 100644
--- a/lib/mauve/source_list.rb
+++ b/lib/mauve/source_list.rb
@@ -169,21 +169,29 @@ module Mauve
     #
     def resolve
       @last_resolved_at = Time.now
-      
-      url_list = []
-      if @url
-        url_list_s = do_get(@url)
-        if url_list_s.is_a?(String)
-          url_list = url_list_s.split("\n").collect{|s| do_parse_source(s)}.flatten.compact
+
+      if true == Configuration.current.minimal_dns_lookups
+
+        new_list = [] + @list
+
+      else
+
+        url_list = []
+        if @url
+          url_list_s = do_get(@url)
+          if url_list_s.is_a?(String)
+            url_list = url_list_s.split("\n").collect{|s| do_parse_source(s)}.flatten.compact
+          end
         end
-      end
 
-      new_list = (url_list + @list).collect do |host| 
-        if host.is_a?(String)
-          [host] + MauveResolv.get_ips_for(host).collect{|i| IPAddr.new(i)}
-        else
-          host
+        new_list = (url_list + @list).collect do |host| 
+          if host.is_a?(String)
+            [host] + MauveResolv.get_ips_for(host).collect{|i| IPAddr.new(i)}
+          else
+            host
+          end
         end
+
       end
 
       @resolved_list = new_list.flatten
-- 
cgit v1.2.1