Skip to content

Commit 8814c29

Browse files
committed
Make sure to add nameservers if using config_info in Resolver
1 parent 1a89d4c commit 8814c29

File tree

3 files changed

+17
-56
lines changed

3 files changed

+17
-56
lines changed

lib/dnsruby/resolver.rb

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,7 @@ def initialize(*args)
453453
begin
454454
if key == :config_info
455455
@config.set_config_info(args[0][:config_info])
456+
add_config_nameservers
456457
elsif key == :nameserver
457458
set_config_nameserver(args[0][:nameserver])
458459
elsif key == :nameservers
@@ -509,9 +510,9 @@ def add_config_nameservers # :nodoc: all
509510
new_resolvers = new_resolvers.select do |resolver|
510511
!resolver.nil? && !resolver.server.nil?
511512
end
512-
if new_resolvers.empty?
513-
raise ArgumentError.new("No valid nameservers found in config")
514-
end
513+
# if new_resolvers.empty?
514+
# raise ArgumentError.new("No valid nameservers found in config")
515+
# end
515516
@single_res_mutex.synchronize { @single_resolvers.concat(new_resolvers) }
516517
if @single_resolvers.nil? || @single_resolvers.empty?
517518
raise ArgumentError.new("No valid nameservers found")

lib/dnsruby/timetest.rb

Lines changed: 0 additions & 53 deletions
This file was deleted.

test/tc_resolver.rb

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -477,5 +477,18 @@ def test_threads
477477
# Dnsruby::Cache.delete("googlöe.com", "MX")
478478

479479
end
480+
481+
def test_config_info
482+
res = Dnsruby::Resolver.new(
483+
config_info: {
484+
# contents here doesn't matter; even setting to {} is enough to cause ResolvTimeout
485+
apply_domain: false,
486+
apply_search_list: false,
487+
},
488+
query_timeout: 3, # make the timeout faster
489+
)
490+
res.do_caching = false
491+
res.query("a.root-servers.net.", "A")
492+
end
480493
end
481494

0 commit comments

Comments
 (0)