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

                        [RT #20802]

diff --git a/CHANGES b/CHANGES
index 6e35cd3fbf58f781460066c5d3928594599574a9..5c9b839c7db7a9bf9b14a07d1a3f19b6b8b11711 100644 (file)
--- 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 978072f58a91de8042df6bf427da44fa5fe63d3c..f0f2cac1f5f9ac9ae8a5646a192c30dc72800bb6 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.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) {