TrueCloudLab/coredns
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Use upstream parsing from master branch (#438)

Browse source
This commit is contained in:
Miek Gieben 2016-11-24 22:31:42 +01:00 • committed by GitHub
parent a951fee291
commit f8b9332265
2 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
middleware/auto/setup.go
View file

@ -2,7 +2,6 @@ package auto
import ( import (
"log" "log"
"net"
"os" "os"
"path" "path"
"regexp" "regexp"
@ -13,6 +12,7 @@ import (
"github.com/miekg/coredns/middleware" "github.com/miekg/coredns/middleware"
"github.com/miekg/coredns/middleware/file" "github.com/miekg/coredns/middleware/file"
"github.com/miekg/coredns/middleware/metrics" "github.com/miekg/coredns/middleware/metrics"
"github.com/miekg/coredns/middleware/pkg/dnsutil"
"github.com/miekg/coredns/middleware/proxy" "github.com/miekg/coredns/middleware/proxy"
"github.com/mholt/caddy" "github.com/mholt/caddy"
@ -149,13 +149,11 @@ func autoParse(c *caddy.Controller) (Auto, error) {
if len(args) == 0 { if len(args) == 0 {
return a, c.ArgErr() return a, c.ArgErr()
} }
for i := 0; i < len(args); i++ { ups, err := dnsutil.ParseHostPortOrFile(args...)
h, p, e := net.SplitHostPort(args[i]) if err != nil {
if e != nil && p == "" { return a, err
args[i] = h + ":53"
}
} }
a.loader.proxy = proxy.New(args) a.loader.proxy = proxy.New(ups)
default: default:
t, _, e := file.TransferParse(c, false) t, _, e := file.TransferParse(c, false)

11
middleware/file/setup.go
View file

@ -2,7 +2,6 @@ package file
import ( import (
"fmt" "fmt"
"net"
"os" "os"
"path" "path"
@ -107,13 +106,11 @@ func fileParse(c *caddy.Controller) (Zones, error) {
if len(args) == 0 { if len(args) == 0 {
return Zones{}, c.ArgErr() return Zones{}, c.ArgErr()
} }
for i := 0; i < len(args); i++ { ups, err := dnsutil.ParseHostPortOrFile(args...)
h, p, e := net.SplitHostPort(args[i]) if err != nil {
if e != nil && p == "" { return Zones{}, err
args[i] = h + ":53"
}
} }
prxy = proxy.New(args) prxy = proxy.New(ups)
} }
for _, origin := range origins { for _, origin := range origins {