From cc0fecf1f77176ed00f5a1f41e6d792a4a1ea372 Mon Sep 17 00:00:00 2001 From: Tom Limoncelli Date: Thu, 16 Jun 2022 15:21:45 -0400 Subject: [PATCH] Revert "CLOUDFLAREAPI: Fix TXT records with quotes" This reverts commit c3f52d228aae805d2c66625dae06cc3a5f00b879. --- models/t_parse.go | 1 - providers/cloudflare/rest.go | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/models/t_parse.go b/models/t_parse.go index dd5bd74d4..21ec2899c 100644 --- a/models/t_parse.go +++ b/models/t_parse.go @@ -42,7 +42,6 @@ func (rc *RecordConfig) PopulateFromString(rtype, contents, origin string) error case "SOA": return rc.SetTargetSOAString(contents) case "SPF", "TXT": - fmt.Printf("DEBUG: popFrmStr txt=%q\n", contents) return rc.SetTargetTXTString(contents) case "SRV": return rc.SetTargetSRVString(contents) diff --git a/providers/cloudflare/rest.go b/providers/cloudflare/rest.go index 616938fb4..7548ac51b 100644 --- a/providers/cloudflare/rest.go +++ b/providers/cloudflare/rest.go @@ -119,7 +119,7 @@ func (c *cloudflareProvider) createRec(rec *models.RecordConfig, domainID string prio = fmt.Sprintf(" %d ", rec.MxPreference) } if rec.Type == "TXT" { - content = rec.GetTargetTXTrfc1035() + content = rec.GetTargetField() } if rec.Type == "DS" { content = fmt.Sprintf("%d %d %d %s", rec.DsKeyTag, rec.DsAlgorithm, rec.DsDigestType, rec.DsDigest) @@ -183,8 +183,9 @@ func (c *cloudflareProvider) modifyRecord(domainID, recID string, proxied bool, TTL: int(rec.TTL), } if rec.Type == "TXT" { - r.Content = rec.GetTargetTXTrfc1035() - fmt.Printf("DEBUG: modifyRecord TXT content = %q\n", r.Content) + if len(rec.TxtStrings) > 1 { + r.Content = `"` + strings.Join(rec.TxtStrings, `" "`) + `"` + } } if rec.Type == "SRV" { r.Data = cfSrvData(rec)