Merge b6c866e into backport/fix_altdomain_dcname_overlap/loudly-defin…

…ite-dingo
hashicorp · Jun 26, 2023 · 85a7888 · 85a7888
2 parents b7e0eb5 + b6c866e
commit 85a7888
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/agent/dns.go b/agent/dns.go
@@ -1048,14 +1048,14 @@ func (d *DNSServer) dispatch(remoteAddr net.Addr, req, resp *dns.Msg, maxRecursi
 }
 
 func (d *DNSServer) trimDomain(query string) string {
-	longer := "." + strings.TrimLeft(d.domain, ".")
-	shorter := "." + strings.TrimLeft(d.altDomain, ".")
+	longer := d.domain
+	shorter := d.altDomain
 
 	if len(shorter) > len(longer) {
 		longer, shorter = shorter, longer
 	}
 
-	if strings.HasSuffix(query, longer) {
+	if strings.HasSuffix(query, "."+strings.TrimLeft(longer, ".")) {
 		return strings.TrimSuffix(query, longer)
 	}
 	return strings.TrimSuffix(query, shorter)