From 39d1ceffb58043b1d7548e7b2245d43260702569 Mon Sep 17 00:00:00 2001 From: Frank Schroeder Date: Mon, 23 Oct 2017 10:08:35 +0200 Subject: [PATCH] Revert "config: do not allow an ANY address as DNS recursor" This reverts commit 1db8d3cb00bec980480d525571cea76c6c49c3e7. --- agent/config/builder.go | 5 ----- agent/config/runtime_test.go | 9 --------- 2 files changed, 14 deletions(-) diff --git a/agent/config/builder.go b/agent/config/builder.go index da5f4fb2b..b59aa94aa 100644 --- a/agent/config/builder.go +++ b/agent/config/builder.go @@ -726,11 +726,6 @@ func (b *Builder) Validate(rt RuntimeConfig) error { return fmt.Errorf("DNS address cannot be a unix socket") } } - for _, a := range rt.DNSRecursors { - if ipaddr.IsAny(a) { - return fmt.Errorf("DNS recursor address cannot be 0.0.0.0, :: or [::]") - } - } if rt.Bootstrap && !rt.ServerMode { return fmt.Errorf("'bootstrap = true' requires 'server = true'") } diff --git a/agent/config/runtime_test.go b/agent/config/runtime_test.go index 0f5d4ca7f..3324841a6 100644 --- a/agent/config/runtime_test.go +++ b/agent/config/runtime_test.go @@ -1463,15 +1463,6 @@ func TestConfigFlagsAndEdgecases(t *testing.T) { hcl: []string{`advertise_addr_wan = "::"`}, err: "Advertise WAN address cannot be 0.0.0.0, :: or [::]", }, - { - desc: "recursors any", - flags: []string{ - `-data-dir=` + dataDir, - }, - json: []string{`{ "recursors": ["::"] }`}, - hcl: []string{`recursors = ["::"]`}, - err: "DNS recursor address cannot be 0.0.0.0, :: or [::]", - }, { desc: "dns_config.udp_answer_limit invalid", flags: []string{