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

diff --git a/bin/named/server.c b/bin/named/server.c
index aa3a3e5fd0739447aacfdf07e1266778a62e8ad8..1ff620434e4daa600d43d165bb2e94f0b6a18aba 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -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);
                }
 

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index ea69f1407b0bd8133b5d912b6659848313f4efa7..e3b2fd5b74cb028c937548826c3647fd3357ab78 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -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;