From: Mark Andrews <marka@isc.org>
Date: Mon, 30 Mar 2020 03:28:58 +0000 (+1100)
Subject: Count queries to the root and TLD servers as well
X-Git-Tag: v9.11.19~2^2~3
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=bf7ed5c550bd1d6a98dbf7631946533824018f25;p=thirdparty%2Fbind9.git

Count queries to the root and TLD servers as well
---

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 0a40859d081..bb238704497 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -3848,16 +3848,14 @@ fctx_try(fetchctx_t *fctx, bool retrying, bool badcache) {
 		}
 	}
 
-	if (dns_name_countlabels(&fctx->domain) > 2) {
-		result = isc_counter_increment(fctx->qc);
-		if (result != ISC_R_SUCCESS) {
-			isc_log_write(dns_lctx, DNS_LOGCATEGORY_RESOLVER,
-				      DNS_LOGMODULE_RESOLVER, ISC_LOG_DEBUG(3),
-				      "exceeded max queries resolving '%s'",
-				      fctx->info);
-			fctx_done(fctx, DNS_R_SERVFAIL, __LINE__);
-			return;
-		}
+	result = isc_counter_increment(fctx->qc);
+	if (result != ISC_R_SUCCESS) {
+		isc_log_write(dns_lctx, DNS_LOGCATEGORY_RESOLVER,
+			      DNS_LOGMODULE_RESOLVER, ISC_LOG_DEBUG(3),
+			      "exceeded max queries resolving '%s'",
+			      fctx->info);
+		fctx_done(fctx, DNS_R_SERVFAIL, __LINE__);
+		return;
 	}
 
 	bucketnum = fctx->bucketnum;