From: Mark Andrews <marka@isc.org>
Date: Tue, 29 Dec 2009 08:53:33 +0000 (+0000)
Subject: 2822.   [bug]           rbtdb.c:loadnode() could return the wrong result.
X-Git-Tag: v9.4.3-P1~2^2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5773d3c007c0c065f83480aa17e61bea728221f9;p=thirdparty%2Fbind9.git

2822.   [bug]           rbtdb.c:loadnode() could return the wrong result.
                        [RT #20802]
---

diff --git a/CHANGES b/CHANGES
index 6e35cd3fbf5..5c9b839c7db 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2822.	[bug]		rbtdb.c:loadnode() could return the wrong result.
+			[RT #20802]
+
 2821.	[doc]		Add note that named-checkconf doesn't automatically
 			read rndc.key and bind.keys [RT #20758]
 
diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index 978072f58a9..f0f2cac1f5f 100644
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbtdb.c,v 1.293 2009/12/23 23:43:01 each Exp $ */
+/* $Id: rbtdb.c,v 1.294 2009/12/29 08:53:33 marka Exp $ */
 
 /*! \file */
 
@@ -6530,7 +6530,7 @@ loadnode(dns_rbtdb_t *rbtdb, dns_name_t *name, dns_rbtnode_t **nodep,
 	if (nsecresult == ISC_R_SUCCESS) {
 		nsecnode->nsec = DNS_RBT_NSEC_NSEC;
 		(*nodep)->nsec = DNS_RBT_NSEC_HAS_NSEC;
-		return (ISC_R_SUCCESS);
+		return (noderesult);
 	}
 
 	if (nsecresult == ISC_R_EXISTS) {