From a5a60037e587fdf47a2acbc92cbb90cfb21d764c Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org>
Date: Tue, 3 Oct 2017 14:07:08 -0700
Subject: [PATCH] [master] fix out-of-order synchronization that affected the
 dnssec test

---
 bin/named/server.c | 2 +-
 lib/dns/zone.c     | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/bin/named/server.c b/bin/named/server.c
index aa3a3e5fd0..1ff620434e 100644
--- 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 ea69f1407b..e3b2fd5b74 100644
--- 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;