From: Mark Andrews <marka@isc.org>
Date: Fri, 17 Jun 2005 01:00:08 +0000 (+0000)
Subject: 1886.   [bug]           Fix unreasonably low quantum on call to
X-Git-Tag: v9.2.6b1~78^2~24
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=83a56f1e4f2d11fa895ceff4342fff7157910036;p=thirdparty%2Fbind9.git

1886.   [bug]           Fix unreasonably low quantum on call to
                        dns_rbt_destroy2().  Remove unnecessay unhash_node()
                        call. [RT #14919]
---

diff --git a/CHANGES b/CHANGES
index fc12d53a062..8bb442dda62 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+1886.	[bug]		Fix unreasonably low quantum on call to
+			dns_rbt_destroy2().  Remove unnecessay unhash_node()
+			call. [RT #14919]
+
 1885.	[func]		Additional memory debugging support to track size
 			and mctx arguements. [RT #14814]
 
diff --git a/lib/dns/rbt.c b/lib/dns/rbt.c
index 1f3463f9ece..74523d96bdb 100644
--- a/lib/dns/rbt.c
+++ b/lib/dns/rbt.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbt.c,v 1.133 2005/06/04 05:32:46 jinmei Exp $ */
+/* $Id: rbt.c,v 1.134 2005/06/17 01:00:08 marka Exp $ */
 
 /*! \file */
 
@@ -2082,7 +2082,10 @@ dns_rbt_deletetreeflat(dns_rbt_t *rbt, unsigned int quantum,
 	if (DATA(node) != NULL && rbt->data_deleter2 != NULL)
 		rbt->data_deleter2(node, rbt->deleter_arg);
 
-	unhash_node(rbt, node);
+	/*
+	 * Note: we don't call unhash_node() here as we are destroying
+	 * the complete rbt tree. 
+         */
 #if DNS_RBT_USEMAGIC
 	node->magic = 0;
 #endif
diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index ef477d715fd..e3c3c579f40 100644
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbtdb.c,v 1.207 2005/06/04 05:32:46 jinmei Exp $ */
+/* $Id: rbtdb.c,v 1.208 2005/06/17 01:00:08 marka Exp $ */
 
 /*! \file */
 
@@ -566,7 +566,7 @@ free_rbtdb(dns_rbtdb_t *rbtdb, isc_boolean_t log, isc_event_t *event) {
  again:
 	if (rbtdb->tree != NULL) {
 		result = dns_rbt_destroy2(&rbtdb->tree,
-					  (rbtdb->task != NULL) ? 5 : 0);
+					  (rbtdb->task != NULL) ? 1000 : 0);
 		if (result == ISC_R_QUOTA) {
 			INSIST(rbtdb->task != NULL);
 			if (event == NULL)