From: Willem Toorop <willem@nlnetlabs.nl>
Date: Sat, 16 Jan 2021 16:18:23 +0000 (+0100)
Subject: ORIGIN from SOA owner, also in SOA rdata fields
X-Git-Tag: 1.8.0-rc.1~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69ba60c3a3ac8c7e1f2a0f34f76280324e47f28f;p=thirdparty%2Fldns.git

ORIGIN from SOA owner, also in SOA rdata fields
---

diff --git a/rr.c b/rr.c
index 2547acb8..24de653e 100644
--- a/rr.c
+++ b/rr.c
@@ -582,10 +582,12 @@ ldns_rr_new_frm_str_internal(ldns_rr **newrr, const char *str,
 						    LDNS_RDF_TYPE_DNAME, ".")
 					    );
 
-				} else if (r && rd_strlen >= 1 && origin &&
-						!ldns_dname_str_absolute(rd)) {
+				} else if (r && rd_strlen >= 1
+				    && (origin || rr_type == LDNS_RR_TYPE_SOA)
+				    && !ldns_dname_str_absolute(rd)) {
 
-					status = ldns_dname_cat(r, origin);
+					status = ldns_dname_cat(r, origin
+					    ? origin : ldns_rr_owner(new));
 					if (status != LDNS_STATUS_OK) {
 						goto error;
 					}