ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 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
Download Patch File Download Diff File Expand all files Collapse all files
bin/named/server.c
+1 -1
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->managed_keys != NULL) {
dns_zone_synckeyzone(pview->managed_keys);
dns_zone_attach(pview->managed_keys,
&view->managed_keys);
dns_zone_setview(pview->managed_keys, view);
dns_view_detach(&pview);
dns_zone_synckeyzone(view->managed_keys);
return (ISC_R_SUCCESS);
}
lib/dns/zone.c
+1 -2
View File
@@ -4220,8 +4220,7 @@ sync_keyzone(dns_zone_t *zone, dns_db_t *db) {
dns_name_t *rrname = NULL;
isc_uint32_t ttl;
dns_rriterator_current(&rrit, &rrname, &ttl,
&rdataset, NULL);
dns_rriterator_current(&rrit, &rrname, &ttl, &rdataset, NULL);
if (!dns_rdataset_isassociated(rdataset)) {
dns_rriterator_destroy(&rrit);
goto failure;