From: Michał Kępień <michal@isc.org>
Date: Wed, 8 Aug 2018 05:56:29 +0000 (+0200)
Subject: Remove unused NS_QUERYATTR_CACHEGLUEOK query attribute
X-Git-Tag: v9.13.3~75^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7db4dedf6b2f910865ebbc5864134e9345e52c5c;p=thirdparty%2Fbind9.git

Remove unused NS_QUERYATTR_CACHEGLUEOK query attribute

The NS_QUERYATTR_CACHEGLUEOK query attribute has no influence on query
processing.  Remove it.
---

diff --git a/lib/ns/include/ns/query.h b/lib/ns/include/ns/query.h
index e6ca2cf4ae0..054c95dfeb2 100644
--- a/lib/ns/include/ns/query.h
+++ b/lib/ns/include/ns/query.h
@@ -101,7 +101,6 @@ struct ns_query {
 #define NS_QUERYATTR_PARTIALANSWER	0x0004
 #define NS_QUERYATTR_NAMEBUFUSED	0x0008
 #define NS_QUERYATTR_RECURSING		0x0010
-#define NS_QUERYATTR_CACHEGLUEOK	0x0020
 #define NS_QUERYATTR_QUERYOKVALID	0x0040
 #define NS_QUERYATTR_QUERYOK		0x0080
 #define NS_QUERYATTR_WANTRECURSION	0x0100
diff --git a/lib/ns/query.c b/lib/ns/query.c
index 58ffe40c1ec..e04b9eefd2e 100644
--- a/lib/ns/query.c
+++ b/lib/ns/query.c
@@ -112,9 +112,6 @@ do { \
 /*% Recursing? */
 #define RECURSING(c)		(((c)->query.attributes & \
 				  NS_QUERYATTR_RECURSING) != 0)
-/*% Cache glue ok? */
-#define CACHEGLUEOK(c)		(((c)->query.attributes & \
-				  NS_QUERYATTR_CACHEGLUEOK) != 0)
 /*% Want Recursion? */
 #define WANTRECURSION(c)	(((c)->query.attributes & \
 				  NS_QUERYATTR_WANTRECURSION) != 0)
@@ -8005,7 +8002,6 @@ query_delegation(query_ctx_t *qctx) {
 	/*
 	 * This is the best answer.
 	 */
-	qctx->client->query.attributes |= NS_QUERYATTR_CACHEGLUEOK;
 	qctx->client->query.isreferral = ISC_TRUE;
 
 	if (!dns_db_iscache(qctx->db) && qctx->client->query.gluedb == NULL) {
@@ -8026,7 +8022,6 @@ query_delegation(query_ctx_t *qctx) {
 	query_addrrset(qctx->client, &qctx->fname,
 		       &qctx->rdataset, sigrdatasetp,
 		       qctx->dbuf, DNS_SECTION_AUTHORITY);
-	qctx->client->query.attributes &= ~NS_QUERYATTR_CACHEGLUEOK;
 	if (detach) {
 		dns_db_detach(&qctx->client->query.gluedb);
 	}