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

                        from insecure zones. [RT# 21555]

diff --git a/CHANGES b/CHANGES
index 2ad15e51f95f083e4414f1058a84dbccac3523d1..f7e937815f3735e66e5a54b2e933389ef2541df8 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2925.  [bug]           Named failed to accept uncachable negative responses
+                       from insecure zones. [RT# 21555]
+
 2923.  [bug]           'dig +trace' could drop core after "connection
                        timeout". [RT #21514]
 

diff --git a/lib/dns/validator.c b/lib/dns/validator.c
index c28db7649e48b3b9463af7763e0133e055ac92e2..08ff74fee7ab664b966166603e89aa9633279cf8 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.155.52.26 2010/06/03 23:46:48 tbox Exp $ */
+/* $Id: validator.c,v 1.155.52.27 2010/06/26 00:08:17 marka Exp $ */
 
 #include <config.h>
 
@@ -2319,11 +2319,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 (;
@@ -2407,11 +2405,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 (;