diff options
| author |  Miek Gieben <miek@miek.nl>
| 2016-11-24 22:31:42 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2016-11-24 22:31:42 +0100 |
| commit | f8b93322659fee6d0456d2da920d92b35cae9273 (patch) | |
| tree | 6acf1568571f1cd0c6a773134b6ac8e3c930d0ed /middleware/auto | |
| parent | a951fee29119eea54bc12113737849731d1a7b82 (diff) | |
| download | coredns-f8b93322659fee6d0456d2da920d92b35cae9273.tar.gz coredns-f8b93322659fee6d0456d2da920d92b35cae9273.tar.zst coredns-f8b93322659fee6d0456d2da920d92b35cae9273.zip | |
Use upstream parsing from master branch (#438)
Diffstat (limited to 'middleware/auto')
| -rw-r--r-- | middleware/auto/setup.go | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/middleware/auto/setup.go b/middleware/auto/setup.go index bf72f4549..1099cb7f3 100644 --- a/middleware/auto/setup.go +++ b/middleware/auto/setup.go @@ -2,7 +2,6 @@ package auto import ( "log" - "net" "os" "path" "regexp" @@ -13,6 +12,7 @@ import ( "github.com/miekg/coredns/middleware" "github.com/miekg/coredns/middleware/file" "github.com/miekg/coredns/middleware/metrics" + "github.com/miekg/coredns/middleware/pkg/dnsutil" "github.com/miekg/coredns/middleware/proxy" "github.com/mholt/caddy" @@ -149,13 +149,11 @@ func autoParse(c *caddy.Controller) (Auto, error) { if len(args) == 0 { return a, c.ArgErr() } - for i := 0; i < len(args); i++ { - h, p, e := net.SplitHostPort(args[i]) - if e != nil && p == "" { - args[i] = h + ":53" - } + ups, err := dnsutil.ParseHostPortOrFile(args...) + if err != nil { + return a, err } - a.loader.proxy = proxy.New(args) + a.loader.proxy = proxy.New(ups) default: t, _, e := file.TransferParse(c, false) |