Readup fixes.

git-svn-id: file:///svn/unbound/trunk@1935 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index ebc5c84998680c709d5d10744d3da9307250090a..1a6f9e185980e5b058a561ac9bf0153819d87a5e 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,7 @@
 10 December 2009: Wouter
        - requirements.txt updated with design choice explanations.
+       - Reading fixes: fix to set unlame when child confirms parent glue,
+         and fix to avoid duplicate addresses in delegation point.
 
 9 December 2009: Wouter
        - Fix Bug#287(reopened): update of ldns tarball with fix for parse

diff --git a/iterator/iter_delegpt.c b/iterator/iter_delegpt.c
index d9a2fca97ba210eb668006544286dabcdd1144b2..f50ec8ac2cc217597ddc876c50251831b73e3a5c 100644 (file)
--- a/iterator/iter_delegpt.c
+++ b/iterator/iter_delegpt.c
@@ -172,6 +172,8 @@ delegpt_add_addr(struct delegpt* dp, struct regional* region,
                if((a = delegpt_find_addr(dp, addr, addrlen))) {
                        if(bogus)
                                a->bogus = bogus;
+                       if(!lame)
+                               a->lame = 0;
                        return 1;
                }
        }
@@ -420,9 +422,9 @@ delegpt_add_rrset(struct delegpt* dp, struct regional* region,
        if(ntohs(rrset->rk.type) == LDNS_RR_TYPE_NS)
                return delegpt_rrset_add_ns(dp, region, rrset);
        else if(ntohs(rrset->rk.type) == LDNS_RR_TYPE_A)
-               return delegpt_add_rrset_A(dp, region, rrset, 0, 0);
+               return delegpt_add_rrset_A(dp, region, rrset, 0, 1);
        else if(ntohs(rrset->rk.type) == LDNS_RR_TYPE_AAAA)
-               return delegpt_add_rrset_AAAA(dp, region, rrset, 0, 0);
+               return delegpt_add_rrset_AAAA(dp, region, rrset, 0, 1);
        log_warn("Unknown rrset type added to delegpt");
        return 1;
 }