PopulateFromRaw*() should always call SetLabel3()

StackExchange · Jan 14, 2025 · b97251a · b97251a
1 parent 5bd4854
commit b97251a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/models/cloudflare_types.go b/models/cloudflare_types.go
@@ -87,10 +87,8 @@ func PopulateFromRawCFSINGLEREDIRECT(rc *RecordConfig, rawfields []string, meta
 	}
 
 	// First rawfield is the label.
-	if origin != "" { //  If we don't know the origin, don't muck with the label.
-		if err := rc.SetLabel3(rawfields[0], rc.SubDomain, origin); err != nil {
-			return err
-		}
+	if err := rc.SetLabel3(rawfields[0], rc.SubDomain, origin); err != nil {
+		return err
 	}
 
 	// Parse the remaining fields.

diff --git a/models/types.go b/models/types.go
@@ -121,11 +121,9 @@ func PopulateFromRawA(rc *RecordConfig, rawfields []string, meta map[string]stri
 	rc.Type = "A"
 
 	// First rawfield is the label.
-	//if origin != "" { //  If we don't know the origin, don't muck with the label.
 	if err := rc.SetLabel3(rawfields[0], rc.SubDomain, origin); err != nil {
 		return err
 	}
-	//}
 
 	// Parse the remaining fields.
 	rdata, err := ParseA(rawfields[1:], origin)
@@ -186,11 +184,9 @@ func PopulateFromRawMX(rc *RecordConfig, rawfields []string, meta map[string]str
 	var err error
 
 	// First rawfield is the label.
-	//if origin != "" { //  If we don't know the origin, don't muck with the label.
 	if err := rc.SetLabel3(rawfields[0], rc.SubDomain, origin); err != nil {
 		return err
 	}
-	//}
 
 	// Parse the remaining fields.
 	rdata, err := ParseMX(rawfields[1:], origin)
@@ -259,11 +255,9 @@ func PopulateFromRawSRV(rc *RecordConfig, rawfields []string, meta map[string]st
 	var err error
 
 	// First rawfield is the label.
-	//if origin != "" { //  If we don't know the origin, don't muck with the label.
 	if err := rc.SetLabel3(rawfields[0], rc.SubDomain, origin); err != nil {
 		return err
 	}
-	//}
 
 	// Parse the remaining fields.
 	rdata, err := ParseSRV(rawfields[1:], origin)