diff options
| -rw-r--r-- | core/dnsserver/server.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/dnsserver/server.go b/core/dnsserver/server.go index 6fe26e7dc..83c9c6168 100644 --- a/core/dnsserver/server.go +++ b/core/dnsserver/server.go @@ -255,7 +255,7 @@ func (s *Server) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) } } - if r.Question[0].Qtype == dns.TypeDS && dshandler != nil { + if r.Question[0].Qtype == dns.TypeDS && dshandler != nil && dshandler.pluginChain != nil { // DS request, and we found a zone, use the handler for the query. rcode, _ := dshandler.pluginChain.ServeDNS(ctx, w, r) if !plugin.ClientWrite(rcode) { @@ -265,7 +265,7 @@ func (s *Server) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) } // Wildcard match, if we have found nothing try the root zone as a last resort. - if h, ok := s.zones["."]; ok { + if h, ok := s.zones["."]; ok && h.pluginChain != nil { rcode, _ := h.pluginChain.ServeDNS(ctx, w, r) if !plugin.ClientWrite(rcode) { DefaultErrorFunc(w, r, rcode) |