2925. [bug] Named failed to accept uncachable negative responses

                        from insecure zones. [RT# 21555]

diff --git a/CHANGES b/CHANGES
index 0cf819ebf2749719c29413cb2210ae3499f8b3ab..aff24d84cbf9821cfa66bd47352345af6c3bb715 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2925.  [bug]           Named failed to accept uncachable negative responses
+                       from insecure zones. [RT# 21555]
+
 2921.  [bug]           The resolver could attempt to destroy a fetch context
                        too soon.  [RT #19878]
 

diff --git a/lib/dns/validator.c b/lib/dns/validator.c
index 806319955f7b534fad8cb8fa81d35febe882a042..37e7a0c64c2ea73a5b3b6eb54bda69448ebd7e45 100644 (file)
--- a/lib/dns/validator.c
+++ b/lib/dns/validator.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: validator.c,v 1.119.18.57 2010/06/03 23:46:10 tbox Exp $ */
+/* $Id: validator.c,v 1.119.18.58 2010/06/26 00:11:50 marka Exp $ */
 
 /*! \file */
 
@@ -2320,11 +2320,9 @@ validate_authority(dns_validator_t *val, isc_boolean_t resume) {
        dns_message_t *message = val->event->message;
        isc_result_t result;
 
-       if (!resume) {
+       if (!resume)
                result = dns_message_firstname(message, DNS_SECTION_AUTHORITY);
-               if (result != ISC_R_SUCCESS)
-                       return (result);
-       } else
+       else
                result = ISC_R_SUCCESS;
 
        for (;
@@ -2408,11 +2406,9 @@ validate_ncache(dns_validator_t *val, isc_boolean_t resume) {
        dns_name_t *name;
        isc_result_t result;
 
-       if (!resume) {
+       if (!resume)
                result = dns_rdataset_first(val->event->rdataset);
-               if (result != ISC_R_SUCCESS)
-                       return (result);
-       } else
+       else
                result = dns_rdataset_next(val->event->rdataset);
 
        for (;