upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-11 15:39:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '3640-fix-control-flow' into 'main'

Browse source 
Fix control flow issues in zone.c

Closes #3640

See merge request isc-projects/bind9!7013
This commit is contained in:
Evan Hunt 2023-01-04 22:48:16 +00:00
commit 480b5c7ca7
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/dns/zone.c
View file

@ -11942,7 +11942,7 @@ static isc_result_t
zone_dump(dns_zone_t *zone, bool compact) {
isc_result_t result;
dns_dbversion_t *version = NULL;
bool again;
bool again, async_write = false;
dns_db_t *db = NULL;
char *masterfile = NULL;
dns_masterformat_t masterformat = dns_masterformat_none;
@ -11984,6 +11984,8 @@ redo:
&zone->writeio);
if (result != ISC_R_SUCCESS) {
zone_idetach(&dummy);
} else {
async_write = true;
}
UNLOCK_ZONE(zone);
} else {
@ -12013,8 +12015,12 @@ fail:
}
masterfile = NULL;
if (result == ISC_R_SUCCESS) {
return (ISC_R_SUCCESS); /* XXXMPA */
if (async_write) {
/*
* Asyncronous write is in progress. Zone flags will get
* updated on completion. Cleanup is complete. We are done.
*/
return (ISC_R_SUCCESS);
}
again = false;