Commit c38cf70d authored by Brian Wellington's avatar Brian Wellington
Browse files

Fix an assertion failure and a case where an rdataset's trust wasn't set.

parent 66f5b00c
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: validator.c,v 1.77 2000/09/07 19:46:51 bwelling Exp $ */
/* $Id: validator.c,v 1.78 2000/09/08 14:18:17 bwelling Exp $ */
#include <config.h>
......@@ -223,6 +223,15 @@ fetch_callback_nullkey(isc_task_t *task, isc_event_t *event) {
result = proveunsecure(val, ISC_TRUE);
if (result != DNS_R_WAIT)
validator_done(val, result);
else {
/*
* Don't free rdataset & sigrdataset, since
* they'll be freed in nullkeyvalidated.
*/
isc_event_free(&event);
UNLOCK(&val->lock);
return;
}
} else {
validator_log(val, ISC_LOG_DEBUG(3),
"found a keyset with a null key");
......@@ -551,7 +560,9 @@ nullkeyvalidated(isc_task_t *task, isc_event_t *event) {
if (eresult == ISC_R_SUCCESS) {
validator_log(val, ISC_LOG_DEBUG(3),
"proved that name is in an unsecure domain");
validator_log(val, ISC_LOG_DEBUG(3), "marking as answer");
LOCK(&val->lock);
val->event->rdataset->trust = dns_trust_answer;
validator_done(val, ISC_R_SUCCESS);
UNLOCK(&val->lock);
} else {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment