From: Jelte Jansen <jeltejan@NLnetLabs.nl>
Date: Wed, 2 Aug 2006 09:14:39 +0000 (+0000)
Subject: don't set prev to root when reading zone
X-Git-Tag: release-1.2.0~198
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f6d45c2ce321e178256060d9872cd6131bc78da3;p=thirdparty%2Fldns.git

don't set prev to root when reading zone
---

diff --git a/rr.c b/rr.c
index 9d650d6d..ac81bfd9 100644
--- a/rr.c
+++ b/rr.c
@@ -255,6 +255,8 @@ ldns_rr_new_frm_str(ldns_rr **newrr, const char *str, uint16_t default_ttl, ldns
 	if (strlen(owner) <= 1 && strncmp(owner, "@", 1) == 0) {
 		if (origin) {
 			ldns_rr_set_owner(new, ldns_rdf_clone(origin));
+		} else if (prev && *prev) {
+			ldns_rr_set_owner(new, ldns_rdf_clone(*prev));			
 		} else {
 			/* default to root */
 			ldns_rr_set_owner(new, ldns_dname_new_frm_str("."));
diff --git a/zone.c b/zone.c
index 7bbbb584..cf915741 100644
--- a/zone.c
+++ b/zone.c
@@ -182,7 +182,7 @@ ldns_zone_new_frm_fp_l(ldns_zone **z, FILE *fp, ldns_rdf *origin, uint16_t ttl,
 		my_prev   = ldns_rdf_clone(origin);
 	} else {
 		my_origin = ldns_dname_new_frm_str(".");
-		my_prev = ldns_dname_new_frm_str(".");
+		my_prev = NULL;
 	}
 
 	while(!feof(fp)) {