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

diff --git a/CHANGES b/CHANGES
index 4857eb3046fa6bac57c3864aa5cf01d541f875d0..cd394820dac2e2c904e5a05589d3d886d91e29e9 100644 (file)
--- 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 90bfdd32ce29c381ee4ab7233675f37ece1d7491..0c3c4e23e5a0583c623a26e6d7062abd5bd3a18a 100644 (file)
--- 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);
        }