diff options
Diffstat (limited to 'plugin/acl')
| -rw-r--r-- | plugin/acl/acl_test.go | 2 | ||||
| -rw-r--r-- | plugin/acl/setup.go | 11 |
2 files changed, 3 insertions, 10 deletions
diff --git a/plugin/acl/acl_test.go b/plugin/acl/acl_test.go index 4c6df95e5..0ab6c1d77 100644 --- a/plugin/acl/acl_test.go +++ b/plugin/acl/acl_test.go @@ -233,7 +233,7 @@ func TestACLServeDNS(t *testing.T) { }, { "Fine-Grained 2 REFUSED", - `acl { + `acl example.org { block net 192.168.1.0/24 }`, []string{"example.org"}, diff --git a/plugin/acl/setup.go b/plugin/acl/setup.go index 1a688a485..3adde0aec 100644 --- a/plugin/acl/setup.go +++ b/plugin/acl/setup.go @@ -43,15 +43,8 @@ func parse(c *caddy.Controller) (ACL, error) { a := ACL{} for c.Next() { r := rule{} - r.zones = c.RemainingArgs() - if len(r.zones) == 0 { - // if empty, the zones from the configuration block are used. - r.zones = make([]string, len(c.ServerBlockKeys)) - copy(r.zones, c.ServerBlockKeys) - } - for i := range r.zones { - r.zones[i] = plugin.Host(r.zones[i]).Normalize() - } + args := c.RemainingArgs() + r.zones = plugin.OriginsFromArgsOrServerBlock(args, c.ServerBlockKeys) for c.NextBlock() { p := policy{} |