635. [bug] Reloading a server with a configured blackhole list

                        would cause an assertion. [RT #590]

diff --git a/CHANGES b/CHANGES
index 2426218170a4d9f0b831eee53a20b4535588c62c..4ee72341f1c36154cf528e6252508ae86db3105b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
 
+ 635.  [bug]           Reloading a server with a configured blackhole list
+                       would cause an assertion. [RT #590]
+
  634.  [bug]           A log file will completely stop being written when
                        it reaches the maximum size in all cases, not just
                        when versioning is also enabled. [RT #570]

diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c
index 339d4f327409484b25f3adda577da704f6c98c26..fe3dec8b9a92fb0807fdf541f51b4b3855f0f24c 100644 (file)
--- a/lib/dns/dispatch.c
+++ b/lib/dns/dispatch.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dispatch.c,v 1.77 2000/12/20 19:46:37 gson Exp $ */
+/* $Id: dispatch.c,v 1.78 2000/12/26 09:48:41 bwelling Exp $ */
 
 #include <config.h>
 
@@ -1155,7 +1155,8 @@ dns_dispatchmgr_create(isc_mem_t *mctx, isc_entropy_t *entropy,
 void
 dns_dispatchmgr_setblackhole(dns_dispatchmgr_t *mgr, dns_acl_t *blackhole) {
        REQUIRE(VALID_DISPATCHMGR(mgr));
-       REQUIRE(mgr->blackhole == NULL);
+       if (mgr->blackhole != NULL)
+               dns_acl_detach(&mgr->blackhole);
        dns_acl_attach(blackhole, &mgr->blackhole);
 }