3220. [bug] Change #3186 was incomplete; dns_db_rpz_findips()

                        could fail to set the database version correctly,
                        causing an assertion failure. [RT #26180]

diff --git a/CHANGES b/CHANGES
index 970ec3767eeacc378caa85cc231e738b2dfa17bd..7d3af18bebf45d6b18ad256e255e2a2a0b001e16 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
        --- 9.9.0b2 released ---
 
+3220.  [bug]           Change #3186 was incomplete; dns_db_rpz_findips()
+                        could fail to set the database version correctly,
+                        causing an assertion failure. [RT #26180]
+
 3219.  [bug]           Disable NOEDNS caching following a timeout.
 
 3218.  [security]      Cache lookup could return RRSIG data associated with

diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index d7b478596c793df41daf5a54c5c9df536741cb1f..1f9bab82245b4b191e4b14046d8286f86da939ff 100644 (file)
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbtdb.c,v 1.321 2011/11/16 09:44:32 each Exp $ */
+/* $Id: rbtdb.c,v 1.322 2011/11/18 18:40:31 each Exp $ */
 
 /*! \file */
 
@@ -4744,6 +4744,7 @@ rpz_findips(dns_rpz_zone_t *rpz, dns_rpz_type_t rpz_type,
                        dns_db_attachnode(db, node, &st->m.node);
                }
                dns_db_attach(db, &st->m.db);
+               st->m.version = version;
                dns_zone_attach(zone, &st->m.zone);
                if (dns_rdataset_isassociated(&zrdataset))
                        dns_rdataset_disassociate(&zrdataset);