diff options
| author | Riccardo Spagni <ric@spagni.net> | 2015-12-30 13:21:50 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2015-12-30 13:21:50 +0200 |
| commit | 91001aa4460a59a42dc14a32c8e90717fd29dbd2 (patch) | |
| tree | 68da43b847d517870a2f5c92a6ef13167730945c /external/unbound/services | |
| parent | Merge pull request #577 (diff) | |
| parent | fix missing unbound tests (diff) | |
| download | monero-91001aa4460a59a42dc14a32c8e90717fd29dbd2.tar.xz | |
Merge pull request #578
3edbf57 fix missing unbound tests (Riccardo Spagni)
2d43ae8 update unbound, fix unbound openssl issue on OS X (Riccardo Spagni)
Diffstat (limited to 'external/unbound/services')
| -rw-r--r-- | external/unbound/services/cache/dns.c | 5 | ||||
| -rw-r--r-- | external/unbound/services/cache/rrset.c | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/external/unbound/services/cache/dns.c b/external/unbound/services/cache/dns.c index ba81afde4..e14e636db 100644 --- a/external/unbound/services/cache/dns.c +++ b/external/unbound/services/cache/dns.c @@ -656,8 +656,9 @@ fill_any(struct module_env* env, time_t now = *env->now; struct dns_msg* msg = NULL; uint16_t lookup[] = {LDNS_RR_TYPE_A, LDNS_RR_TYPE_AAAA, - LDNS_RR_TYPE_MX, LDNS_RR_TYPE_SOA, LDNS_RR_TYPE_NS, 0}; - int i, num=5; /* number of RR types to look up */ + LDNS_RR_TYPE_MX, LDNS_RR_TYPE_SOA, LDNS_RR_TYPE_NS, + LDNS_RR_TYPE_DNAME, 0}; + int i, num=6; /* number of RR types to look up */ log_assert(lookup[num] == 0); for(i=0; i<num; i++) { diff --git a/external/unbound/services/cache/rrset.c b/external/unbound/services/cache/rrset.c index 2c8552953..2f6a1b506 100644 --- a/external/unbound/services/cache/rrset.c +++ b/external/unbound/services/cache/rrset.c @@ -190,6 +190,7 @@ rrset_cache_update(struct rrset_cache* r, struct rrset_ref* ref, uint16_t rrset_type = ntohs(k->rk.type); int equal = 0; log_assert(ref->id != 0 && k->id != 0); + log_assert(k->rk.dname != NULL); /* looks up item with a readlock - no editing! */ if((e=slabhash_lookup(&r->table, h, k, 0)) != 0) { /* return id and key as they will be used in the cache |