mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 22:15:20 +00:00
Code Issues Releases Wiki Activity

Merge branch '4496-do-not-destroy-ixfr-journal-in-xfrin_end' into 'main'

Browse Source 
Do not destroy IXFR journal in xfrin_end()

Closes #4496

See merge request isc-projects/bind9!8602
This commit is contained in:
Michał Kępień
2023-12-20 16:32:04 +00:00
parent 1349733fbc 80695e9897
commit c04d87f13c
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@@ -1,3 +1,7 @@
6308. [bug] Prevent crashes caused by the zone journal getting
destroyed before all changes from an incoming IXFR are
written to it. [GL #4496]
6307. [bug] Obtain a client->handle reference when calling 6307. [bug] Obtain a client->handle reference when calling
async_restart. [GL #4439] async_restart. [GL #4439]

2
lib/dns/probes.d
View File

@@ -17,8 +17,6 @@ provider libdns {
probe xfrin_connected(void *, char *, int); probe xfrin_connected(void *, char *, int);
probe xfrin_done_callback_begin(void *, char *, int); probe xfrin_done_callback_begin(void *, char *, int);
probe xfrin_done_callback_end(void *, char *, int); probe xfrin_done_callback_end(void *, char *, int);
probe xfrin_journal_destroy_begin(void *, char *, int);
probe xfrin_journal_destroy_end(void *, char *, int);
probe xfrin_read(void *, char *, int); probe xfrin_read(void *, char *, int);
probe xfrin_recv_answer(void *, char *, void *); probe xfrin_recv_answer(void *, char *, void *);
probe xfrin_recv_done(void *, char *, int); probe xfrin_recv_done(void *, char *, int);

7
lib/dns/xfrin.c
View File

@@ -1656,13 +1656,6 @@ get_edns_expire(dns_xfrin_t *xfr, dns_message_t *msg) {
static void static void
xfrin_end(dns_xfrin_t *xfr, isc_result_t result) { xfrin_end(dns_xfrin_t *xfr, isc_result_t result) {
/* Close the journal. */
if (xfr->ixfr.journal != NULL) {
LIBDNS_XFRIN_JOURNAL_DESTROY_BEGIN(xfr, xfr->info, result);
dns_journal_destroy(&xfr->ixfr.journal);
LIBDNS_XFRIN_JOURNAL_DESTROY_END(xfr, xfr->info, result);
}
/* Inform the caller. */ /* Inform the caller. */
if (xfr->done != NULL) { if (xfr->done != NULL) {
LIBDNS_XFRIN_DONE_CALLBACK_BEGIN(xfr, xfr->info, result); LIBDNS_XFRIN_DONE_CALLBACK_BEGIN(xfr, xfr->info, result);