diff options
author | 2021-05-17 22:19:54 +0200 | |
---|---|---|
committer | 2021-05-17 13:19:54 -0700 | |
commit | 5f41d8eb1f74621ada05968dd6b0d24f9ae742df (patch) | |
tree | 9a75f00225cea18ea04224d882eb2fc11f5933df /plugin/hosts/setup.go | |
parent | 540937964890ad36b56841374f7f83ef7a2a0247 (diff) | |
download | coredns-5f41d8eb1f74621ada05968dd6b0d24f9ae742df.tar.gz coredns-5f41d8eb1f74621ada05968dd6b0d24f9ae742df.tar.zst coredns-5f41d8eb1f74621ada05968dd6b0d24f9ae742df.zip |
reverse zone: fix Normalize (#4621)
Make normalize return multiple "hosts" (= reverse zones) when a
non-octet boundary cidr is given.
Added pkg/cidr package that holds the cidr calculation routines; felt
they didn't really fit dnsutil.
This change means the IPNet return parameter isn't needed, the hosts are
all correct. The tests that tests this is also removed: TestSplitHostPortReverse
The fallout was that zoneAddr _also_ doesn't need the IPNet member, that
in turn make it visible that zoneAddr in address.go duplicated a bunch
of stuff from register.go; removed/refactored that too.
Created a plugin.OriginsFromArgsOrServerBlock to help plugins do the
right things, by consuming ZONE arguments; this now expands reverse
zones correctly. This is mostly mechanical.
Remove the reverse test in plugin/kubernetes which is a copy-paste from
a core test (which has since been fixed).
Remove MustNormalize as it has no plugin users.
This change is not backwards compatible to plugins that have a ZONE
argument that they parse in the setup util.
All in-tree plugins have been updated.
Signed-off-by: Miek Gieben <miek@miek.nl>
Diffstat (limited to 'plugin/hosts/setup.go')
-rw-r--r-- | plugin/hosts/setup.go | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/plugin/hosts/setup.go b/plugin/hosts/setup.go index f79b2446c..c256dc19a 100644 --- a/plugin/hosts/setup.go +++ b/plugin/hosts/setup.go @@ -106,16 +106,7 @@ func hostsParse(c *caddy.Controller) (Hosts, error) { } } - origins := make([]string, len(c.ServerBlockKeys)) - copy(origins, c.ServerBlockKeys) - if len(args) > 0 { - origins = args - } - - for i := range origins { - origins[i] = plugin.Host(origins[i]).Normalize() - } - h.Origins = origins + h.Origins = plugin.OriginsFromArgsOrServerBlock(args, c.ServerBlockKeys) for c.NextBlock() { switch c.Val() { |