mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-29 13:38:26 +00:00
Code Issues Releases Wiki Activity

[master] fix out-of-order synchronization that affected the dnssec test

Browse Source
This commit is contained in:
Evan Hunt 2017-10-03 14:07:08 -07:00
parent 57c04ec865
commit a5a60037e5
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/named/server.c
View File

@ -6049,11 +6049,11 @@ add_keydata_zone(dns_view_t *view, const char *directory, isc_mem_t *mctx) {
if (pview != NULL) { if (pview != NULL) {
if (pview->managed_keys != NULL) { if (pview->managed_keys != NULL) {
dns_zone_synckeyzone(pview->managed_keys);
dns_zone_attach(pview->managed_keys, dns_zone_attach(pview->managed_keys,
&view->managed_keys); &view->managed_keys);
dns_zone_setview(pview->managed_keys, view); dns_zone_setview(pview->managed_keys, view);
dns_view_detach(&pview); dns_view_detach(&pview);
dns_zone_synckeyzone(view->managed_keys);
return (ISC_R_SUCCESS); return (ISC_R_SUCCESS);
} }

3
lib/dns/zone.c
View File

@ -4220,8 +4220,7 @@ sync_keyzone(dns_zone_t *zone, dns_db_t *db) {
dns_name_t *rrname = NULL; dns_name_t *rrname = NULL;
isc_uint32_t ttl; isc_uint32_t ttl;
dns_rriterator_current(&rrit, &rrname, &ttl, dns_rriterator_current(&rrit, &rrname, &ttl, &rdataset, NULL);
&rdataset, NULL);
if (!dns_rdataset_isassociated(rdataset)) { if (!dns_rdataset_isassociated(rdataset)) {
dns_rriterator_destroy(&rrit); dns_rriterator_destroy(&rrit);
goto failure; goto failure;