From 0b30fca935d1731248b05d36b9083682175c13f1 Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Fri, 5 Nov 2010 15:29:50 +0000 Subject: [PATCH] - do not synthesize a CNAME message from cache for qtype DS. git-svn-id: file:///svn/unbound/trunk@2335 be551aaa-1e26-0410-a405-d3ace91eadb9 --- doc/Changelog | 3 +++ services/cache/dns.c | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/doc/Changelog b/doc/Changelog index 1492a023c..b429b8ee5 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,6 @@ +5 November 2010: Wouter + - do not synthesize a CNAME message from cache for qtype DS. + 4 November 2010: Wouter - Use central entropy to seed threads. diff --git a/services/cache/dns.c b/services/cache/dns.c index 3270982ef..4f3eee8cb 100644 --- a/services/cache/dns.c +++ b/services/cache/dns.c @@ -630,8 +630,10 @@ dns_cache_lookup(struct module_env* env, lock_rw_unlock(&rrset->entry.lock); } - /* see if we have CNAME for this domain */ - if( (rrset=rrset_cache_lookup(env->rrset_cache, qname, qnamelen, + /* see if we have CNAME for this domain, + * but not for DS records (which are part of the parent) */ + if( qtype != LDNS_RR_TYPE_DS && + (rrset=rrset_cache_lookup(env->rrset_cache, qname, qnamelen, LDNS_RR_TYPE_CNAME, qclass, 0, now, 0))) { struct dns_msg* msg = rrset_msg(rrset, region, now, &k); if(msg) { -- 2.47.2