2776. [bug] Change #2762 was not correct. [RT #20647]

diff --git a/CHANGES b/CHANGES
index 82f8c615da7a67549c07d3546ad8a20c8d7bddf2..34a8f6e098a1158e7fbfef2b974539727c9702ef 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2776.  [bug]           Change #2762 was not correct. [RT #20647]
+
 2775.  [bug]           Accept RSASHA256 and RSASHA512 as NSEC3 compatible
                        in dnssec-keyfromlabel. [RT #20643]
 

diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index bfb4cf01b8351edaa73f4896d28b6e880d14588c..5aef2c5e8ce50bd9ca67a7c76bdd29b0c861f706 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.288 2009/11/17 23:55:18 marka Exp $ */
+/* $Id: rbtdb.c,v 1.289 2009/11/23 02:10:16 marka Exp $ */
 
 /*! \file */
 
@@ -3269,6 +3269,8 @@ previous_closest_nsec(dns_rdatatype_t type, rbtdb_search_t *search,
                                 */
                                result = dns_rbtnodechain_prev(nsecchain,
                                                        name, origin);
+                               if (result == DNS_R_NEWORIGIN)
+                                       result = ISC_R_SUCCESS;
                        } else if (result == ISC_R_NOTFOUND
                                   || result == DNS_R_PARTIALMATCH) {
                                result = dns_rbtnodechain_current(nsecchain,
@@ -3286,7 +3288,7 @@ previous_closest_nsec(dns_rdatatype_t type, rbtdb_search_t *search,
                         */
                        result = dns_rbtnodechain_prev(nsecchain, name, origin);
                        if (result == DNS_R_NEWORIGIN)
-                               result = ISC_R_NOTFOUND;
+                               result = ISC_R_SUCCESS;
                        if (result != ISC_R_SUCCESS)
                                return (result);
                }