mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 06:55:30 +00:00
Code Issues Releases Wiki Activity

cleared up some DNS_R_CONTINUE/DNS_R_WAIT confusion;

Browse Source 
commented get_dst_key()
This commit is contained in:
Andreas Gustafsson
2000-04-06 23:09:01 +00:00
parent 94497580d8
commit 93c786e092
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/dns/validator.c
View File

@@ -116,6 +116,13 @@ validator_done(dns_validator_t *val, isc_result_t result) {
} }
/*
* Try to find a key that could have signed 'siginfo' among those
* in 'rdataset'. If found, build a dst_key_t for it and point
* val->key at it.
*
* XXX does not handle key tag collisions.
*/
static inline isc_result_t static inline isc_result_t
get_dst_key(dns_validator_t *val, dns_siginfo_t *siginfo, get_dst_key(dns_validator_t *val, dns_siginfo_t *siginfo,
dns_rdataset_t *rdataset) dns_rdataset_t *rdataset)
@@ -322,12 +329,17 @@ validate(dns_validator_t *val, isc_boolean_t resume) {
event = val->event; event = val->event;
if (!resume) { if (resume) {
/* We alraedy have a sigrdataset. */
result = ISC_R_SUCCESS;
} else {
result = dns_rdataset_first(event->sigrdataset); result = dns_rdataset_first(event->sigrdataset);
if (result != ISC_R_SUCCESS)
return (result);
} }
do {
for (;
result == ISC_R_SUCCESS;
result = dns_rdataset_next(event->sigrdataset))
{
dns_rdataset_current(event->sigrdataset, &rdata); dns_rdataset_current(event->sigrdataset, &rdata);
rdata_to_siginfo(&rdata, &siginfo); rdata_to_siginfo(&rdata, &siginfo);
@@ -339,6 +351,8 @@ validate(dns_validator_t *val, isc_boolean_t resume) {
if (!resume) { if (!resume) {
result = get_key(val, &siginfo); result = get_key(val, &siginfo);
if (result == DNS_R_CONTINUE)
continue; /* Try the next SIG RR. */
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
return (result); return (result);
} }
@@ -348,10 +362,7 @@ validate(dns_validator_t *val, isc_boolean_t resume) {
val->key, val->view->mctx, &rdata); val->key, val->view->mctx, &rdata);
if (result == ISC_R_SUCCESS) if (result == ISC_R_SUCCESS)
return (result); return (result);
}
result = dns_rdataset_next(event->sigrdataset);
} while (result == ISC_R_SUCCESS);
return (result); return (result);
} }
@@ -375,7 +386,7 @@ validator_start(dns_validator_t *val) {
result = ISC_R_NOTIMPLEMENTED; result = ISC_R_NOTIMPLEMENTED;
} }
if (result != DNS_R_CONTINUE) if (result != DNS_R_WAIT)
validator_done(val, result); validator_done(val, result);
UNLOCK(&val->lock); UNLOCK(&val->lock);