mirror of
https://github.com/StackExchange/dnscontrol.git
synced 2024-05-11 05:55:12 +00:00
REFACTOR: Opinion: TXT records are one long string (#2631)
Co-authored-by: Costas Drogos <costas.drogos@gmail.com> Co-authored-by: imlonghao <git@imlonghao.com> Co-authored-by: Jeffrey Cafferata <jeffrey@jcid.nl> Co-authored-by: Vincent Hagen <blackshadev@users.noreply.github.com>
This commit is contained in:
@ -287,7 +287,7 @@ func GetZone(args GetZoneArgs) error {
|
||||
}
|
||||
|
||||
fmt.Fprintf(w, "%s\t%s\t%d\tIN\t%s\t%s%s\n",
|
||||
rec.NameFQDN, rec.Name, rec.TTL, rec.Type, rec.GetTargetCombined(), cfproxy)
|
||||
rec.NameFQDN, rec.Name, rec.TTL, rec.Type, rec.GetTargetCombinedFunc(nil), cfproxy)
|
||||
}
|
||||
|
||||
default:
|
||||
@ -351,11 +351,7 @@ func formatDsl(zonename string, rec *models.RecordConfig, defaultTTL uint32) str
|
||||
case "TLSA":
|
||||
target = fmt.Sprintf(`%d, %d, %d, "%s"`, rec.TlsaUsage, rec.TlsaSelector, rec.TlsaMatchingType, rec.GetTargetField())
|
||||
case "TXT":
|
||||
if len(rec.TxtStrings) == 1 {
|
||||
target = `"` + rec.TxtStrings[0] + `"`
|
||||
} else {
|
||||
target = `["` + strings.Join(rec.TxtStrings, `", "`) + `"]`
|
||||
}
|
||||
target = jsonQuoted(rec.GetTargetTXTJoined())
|
||||
// TODO(tlim): If this is an SPF record, generate a SPF_BUILDER().
|
||||
case "NS":
|
||||
// NS records at the apex should be NAMESERVER() records.
|
||||
|
Reference in New Issue
Block a user