From: Mark Andrews <marka@isc.org>
Date: Sat, 26 Jun 2010 00:08:17 +0000 (+0000)
Subject: 2925.   [bug]           Named failed to accept uncachable negative responses
X-Git-Tag: v9.5.3b1~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9151e302c9a186a2dc22cf8d53a86551dfe44afa;p=thirdparty%2Fbind9.git

2925.   [bug]           Named failed to accept uncachable negative responses
                        from insecure zones. [RT# 21555]
---

diff --git a/CHANGES b/CHANGES
index 2ad15e51f95..f7e937815f3 100644
--- 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 c28db7649e4..08ff74fee7a 100644
--- 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 (;