Merge branch 'master' of github.com:StackExchange/dnscontrol

This commit is contained in:
Craig Peterson 2017-06-05 15:08:38 -04:00
commit 4bb2562d45

View file

@ -264,6 +264,8 @@ func NormalizeAndValidateConfig(config *models.DNSConfig) (errs []error) {
// Canonicalize Targets. // Canonicalize Targets.
if rec.Type == "CNAME" || rec.Type == "MX" || rec.Type == "NS" { if rec.Type == "CNAME" || rec.Type == "MX" || rec.Type == "NS" {
rec.Target = dnsutil.AddOrigin(rec.Target, domain.Name+".") rec.Target = dnsutil.AddOrigin(rec.Target, domain.Name+".")
} else if rec.Type == "A" || rec.Type == "AAAA" {
rec.Target = net.ParseIP(rec.Target).String()
} }
// Populate FQDN: // Populate FQDN:
rec.NameFQDN = dnsutil.AddOrigin(rec.Name, domain.Name) rec.NameFQDN = dnsutil.AddOrigin(rec.Name, domain.Name)