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 e6ca2cf4ae0941ba1d108755fc5476bfd8d7b6e9..054c95dfeb245e47cbd8694c4334f75084f78bee 100644 (file)
--- 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 58ffe40c1ecab6ff3200965070edbfd0cee941fa..e04b9eefd2e25a30dfc85b1bd049373fe7654258 100644 (file)
--- 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);
        }