don't set prev to root when reading zone

diff --git a/rr.c b/rr.c
index 9d650d6df852b66aff186c06e97488a154d04e00..ac81bfd92b2d4583811d2abe9635c9e34909a75e 100644 (file)
--- 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 7bbbb58451e3d6859fec0efed4e337bfb9bdea08..cf9157417a91d397183d73232d985642a929dbc1 100644 (file)
--- 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)) {