2774. [bug] Existing cache DB wasn't being reused after

			reconfiguration. [RT #20629]

diff --git a/CHANGES b/CHANGES
index 7bc19c2924ef67fc4f2eb09e5393015911783ded..e7f958ad78ea747ef05fa6c3cd0b38c404540edd 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2774.  [bug]           Existing cache DB wasn't being reused after
+                       reconfiguration. [RT #20629]
+
 2773.  [bug]           In autosigned zones, the SOA could be signed
                        with the KSK. [RT #20628]
 

diff --git a/bin/named/server.c b/bin/named/server.c
index 99ef01eff0ac181a268739b3faf01c0f6c50246c..3297dd8f83d082ad19e257236e7b9fc1777b5b06 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.554 2009/10/27 22:46:13 each Exp $ */
+/* $Id: server.c,v 1.555 2009/11/19 18:52:40 each Exp $ */
 
 /*! \file */
 
@@ -1590,8 +1590,8 @@ configure_view(dns_view_t *view, const cfg_obj_t *config,
                        if (result != ISC_R_NOTFOUND && result != ISC_R_SUCCESS)
                                goto cleanup;
                        if (pview != NULL) {
-                               if (cache_reusable(pview, view,
-                                                  zero_no_soattl)) {
+                               if (!cache_reusable(pview, view,
+                                                   zero_no_soattl)) {
                                        isc_log_write(ns_g_lctx,
                                                      NS_LOGCATEGORY_GENERAL,
                                                      NS_LOGMODULE_SERVER,