github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update agent/dns.go 

Co-authored-by: Michael Zalimeni <michael.zalimeni@hashicorp.com>
pull/20688/head
John Murret 2024-02-20 13:07:09 -07:00
parent a15a957a36
commit 008451aa1e
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
agent/dns.go
View File

@ -413,7 +413,11 @@ func (d *DNSServer) handlePtr(resp dns.ResponseWriter, req *dns.Msg) {
m.SetReply(req) m.SetReply(req)
m.Compress = !cfg.DisableCompression m.Compress = !cfg.DisableCompression
m.Authoritative = true m.Authoritative = true
<<<<<<< HEAD
recursionAvailable := atomic.LoadUint32(&(d.recursorEnabled)) == 1 recursionAvailable := atomic.LoadUint32(&(d.recursorEnabled)) == 1
=======
recursionAvailable := len(cfg.Recursors) > 0 && atomic.LoadUint32(&(d.recursorEnabled)) != 1
>>>>>>> fbe92df712 (Update agent/dns.go)
m.RecursionAvailable = recursionAvailable m.RecursionAvailable = recursionAvailable
// Only add the SOA if requested // Only add the SOA if requested