From 975305732e72246890a10fb2cddf0d2ce32c916c Mon Sep 17 00:00:00 2001 From: Miek Gieben Date: Fri, 31 Jul 2020 10:58:09 +0200 Subject: [PATCH] backend: fix root zone usage (#4039) properly concatenate labels by using dnsutil.Join instead of '+' Fixes: #3316 Signed-off-by: Miek Gieben --- plugin/backend_lookup.go | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/plugin/backend_lookup.go b/plugin/backend_lookup.go index 9d7e366a3..5e08efb78 100644 --- a/plugin/backend_lookup.go +++ b/plugin/backend_lookup.go @@ -422,7 +422,7 @@ func NS(ctx context.Context, b ServiceBackend, zone string, state request.Reques old := state.QName() state.Clear() - state.Req.Question[0].Name = "ns.dns." + zone + state.Req.Question[0].Name = dnsutil.Join("ns.dns.", zone) services, err := b.Services(ctx, state, false, opt) if err != nil { return nil, nil, err @@ -462,12 +462,8 @@ func SOA(ctx context.Context, b ServiceBackend, zone string, state request.Reque header := dns.RR_Header{Name: zone, Rrtype: dns.TypeSOA, Ttl: ttl, Class: dns.ClassINET} - Mbox := hostmaster + "." - Ns := "ns.dns." - if zone[0] != '.' { - Mbox += zone - Ns += zone - } + Mbox := dnsutil.Join(hostmaster, zone) + Ns := dnsutil.Join("ns.dns", zone) soa := &dns.SOA{Hdr: header, Mbox: Mbox,