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

Merge branch '4031-remove-dead-code-from-dns_zone' into 'main'

Browse source 
Fix a logical flaw that would skip logging notify success

Closes #4031

See merge request isc-projects/bind9!7879
This commit is contained in:
Ondřej Surý 2023-05-03 19:52:22 +00:00
commit 909f008080
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/dns/zone.c
View file

@ -15802,17 +15802,14 @@ notify_done(void *arg) {
(int)buf.used, rcode);
}
dns_message_detach(&message);
goto done;
fail:
dns_message_detach(&message);
if (result == ISC_R_SUCCESS) {
notify_log(notify->zone, ISC_LOG_INFO,
notify_log(notify->zone, ISC_LOG_DEBUG(1),
"notify to %s successful", addrbuf);
} else if (result == ISC_R_SHUTTINGDOWN || result == ISC_R_CANCELED) {
goto done;
/* just destroy the notify */
} else if ((notify->flags & DNS_NOTIFY_TCP) == 0) {
notify_log(notify->zone, ISC_LOG_NOTICE,
"notify to %s failed: %s: retrying over TCP",
@ -15830,7 +15827,6 @@ fail:
"notify to %s failed: %s", addrbuf,
isc_result_totext(result));
}
done:
notify_destroy(notify, false);
}