From 9ad0ebf65eafefe3dd879ba61e2f58309ad90556 Mon Sep 17 00:00:00 2001
From: Bob Halley <source@isc.org>
Date: Fri, 15 Oct 1999 20:51:19 +0000
Subject: [PATCH] Start dealing with the DNS_R_UNCHANGED case when adding
 rdatasets.

---
 lib/dns/resolver.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index bc79e04aad..0cc4d1aa5e 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -1122,7 +1122,19 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, isc_stdtime_t now) {
 						    rdataset,
 						    ISC_FALSE,
 						    addedrdataset);
-			if (result != ISC_R_SUCCESS)
+			if (result == DNS_R_UNCHANGED) {
+				if (ANSWER(rdataset) &&
+				    ardataset != NULL) {
+					/*
+					 * Deal with the case where
+					 * addedrdataset is an NXDOMAIN
+					 * or NXRRSET negative cache
+					 * rdataset; i.e. set eresult
+					 * correctly
+					 */
+					INSIST(0);
+				}
+			} else if (result != ISC_R_SUCCESS)
 				break;
 		}
 	}