Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-10-31 18:23:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

mw/federation: correct parse (#1027)

Browse Source 
Fix parse error and add testcase when a ZONE is specified.

Fixes #1024
This commit is contained in:
Miek Gieben
2017-09-06 22:25:05 +01:00
committed by GitHub
parent 9452a0a3bc
commit c514197d6b
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
middleware/federation/setup.go
View File

@@ -49,17 +49,25 @@ func federationParse(c *caddy.Controller) (*Federation, error) {
for c.Next() {
// federation [zones..]
origins := make([]string, len(c.ServerBlockKeys))
copy(origins, c.ServerBlockKeys)
zones := c.RemainingArgs()
origins := []string{}
if len(zones) > 0 {
origins = make([]string, len(zones))
copy(origins, zones)
} else {
origins = make([]string, len(c.ServerBlockKeys))
copy(origins, c.ServerBlockKeys)
}
for c.NextBlock() {
x := c.Val()
switch c.Val() {
switch x {
default:
args := c.RemainingArgs()
if len(args) != 1 {
return fed, fmt.Errorf("need two arguments for federation: %q", args)
if x := len(args); x != 1 {
return fed, fmt.Errorf("need two arguments for federation, got %d", x)
}
fed.f[x] = dns.Fqdn(args[0])
}
}