2
0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-29 13:38:26 +00:00

Merge branch '4039-dighost-fix-double-shutdown-call' into 'main'

dighost.c: don't call check_if_done() twice successively

Closes #4039

See merge request isc-projects/bind9!7878
This commit is contained in:
Arаm Sаrgsyаn 2023-05-10 11:36:23 +00:00
commit 88cf7e7e9a
2 changed files with 6 additions and 2 deletions

View File

@ -1,3 +1,7 @@
6165. [bug] Fix a logic error in dighost.c which could call the
dighost_shutdown() callback twice and cause problems
if the callback function was not idempotent. [GL #4039]
6164. [bug] Set the rndc idle read timeout back to 60 seconds, 6164. [bug] Set the rndc idle read timeout back to 60 seconds,
from the netmgr default of 30 seconds, in order to from the netmgr default of 30 seconds, in order to
match the behavior of 9.16 and earlier. [GL #4046] match the behavior of 9.16 and earlier. [GL #4046]

View File

@ -3212,11 +3212,11 @@ udp_ready(isc_nmhandle_t *handle, isc_result_t eresult, void *arg) {
if (next != NULL) { if (next != NULL) {
start_udp(next); start_udp(next);
check_if_done();
} else { } else {
clear_current_lookup(); clear_current_lookup();
} }
check_if_done();
return; return;
} }
@ -3609,11 +3609,11 @@ tcp_connected(isc_nmhandle_t *handle, isc_result_t eresult, void *arg) {
if (next != NULL) { if (next != NULL) {
start_tcp(next); start_tcp(next);
check_if_done();
} else { } else {
clear_current_lookup(); clear_current_lookup();
} }
check_if_done();
return; return;
} }