From: Evan Hunt <each@isc.org>
Date: Wed, 16 Feb 2011 19:48:12 +0000 (+0000)
Subject: 3021.	[bug]		Change #3010 was incomplete. [RT #22296]
X-Git-Tag: v9.7.3-P1~2^4~72
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=29bd52e4ee3fa047474d5d5b405d1e09c800a6f4;p=thirdparty%2Fbind9.git

3021.	[bug]		Change #3010 was incomplete. [RT #22296]
---

diff --git a/CHANGES b/CHANGES
index 4857eb3046f..cd394820dac 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3021.	[bug]		Change #3010 was incomplete. [RT #22296]
+
 3020.	[bug]		auto-dnssec failed to correctly update the zone when
 			changing the DNSKEY RRset. [RT #23232]
 
diff --git a/bin/named/server.c b/bin/named/server.c
index 90bfdd32ce2..0c3c4e23e5a 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: server.c,v 1.602 2011/02/03 12:18:10 tbox Exp $ */
+/* $Id: server.c,v 1.603 2011/02/16 19:48:12 each Exp $ */
 
 /*! \file */
 
@@ -3476,6 +3476,7 @@ add_keydata_zone(dns_view_t *view, const char *directory, isc_mem_t *mctx) {
 
 	if (pview != NULL && pview->managed_keys != NULL) {
 		dns_zone_attach(pview->managed_keys, &view->managed_keys);
+		dns_zone_setview(pview->managed_keys, view);
 		dns_view_detach(&pview);
 		return (ISC_R_SUCCESS);
 	}