Merge branch '3830-nsupdate-failed-to-handle-primary-server-address-lookup-gracefully' into 'main'

Resolve "nsupdate failed to handle primary server address lookup gracefully"

Closes #3830

See merge request isc-projects/bind9!7444
This commit is contained in:
Mark Andrews
2023-01-31 13:13:18 +00:00
2 changed files with 12 additions and 2 deletions

View File

@@ -1,3 +1,6 @@
6081. [bug] Handle primary server address lookup failures in
nsupdate more gracefully. [GL #3830]
6080. [bug] 'named -V' leaked memory. [GL #3829]
6079. [bug] Force set the DS state after a 'rdnc dnssec -checkds'

View File

@@ -2797,8 +2797,8 @@ recvsoa(isc_task_t *task, isc_event_t *event) {
dns_request_destroy(&request);
dns_message_detach(&soaquery);
ddebug("Out of recvsoa");
done_update();
seenerror = true;
done_update();
return;
}
@@ -2903,7 +2903,14 @@ lookforsoa:
primary_total = get_addresses(serverstr, dnsport,
primary_servers, primary_alloc);
if (primary_total == 0) {
exit(1);
seenerror = true;
dns_rdata_freestruct(&soa);
dns_message_detach(&soaquery);
dns_request_destroy(&request);
dns_message_detach(&rcvmsg);
ddebug("Out of recvsoa");
done_update();
return;
}
primary_inuse = 0;
} else {