|
 |
2c0af7 |
From 9f9ce5d91a944407e13360e9c92c090d23777a8b Mon Sep 17 00:00:00 2001
|
|
|
2c0af7 |
From: Mark Andrews <marka@isc.org>
|
|
|
2c0af7 |
Date: Fri, 27 May 2016 18:39:33 +1000
|
|
|
2c0af7 |
Subject: [PATCH] fix merge error
|
|
|
2c0af7 |
|
|
|
2c0af7 |
---
|
|
|
2c0af7 |
bin/named/query.c | 31 +++++++++++++++++++++++++++++++
|
|
|
2c0af7 |
1 file changed, 31 insertions(+)
|
|
|
2c0af7 |
|
|
|
2c0af7 |
diff --git a/bin/named/query.c b/bin/named/query.c
|
|
|
2c0af7 |
index 6e988f5686..2c44e9ff53 100644
|
|
|
2c0af7 |
--- a/bin/named/query.c
|
|
|
2c0af7 |
+++ b/bin/named/query.c
|
|
|
2c0af7 |
@@ -7195,6 +7195,37 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
|
|
|
2c0af7 |
* we know the answer.
|
|
|
2c0af7 |
*/
|
|
|
2c0af7 |
|
|
|
2c0af7 |
+ /*
|
|
|
2c0af7 |
+ * If we have a zero ttl from the cache refetch it.
|
|
|
2c0af7 |
+ */
|
|
|
2c0af7 |
+ if (!is_zone && event == NULL && rdataset->ttl == 0 &&
|
|
|
2c0af7 |
+ RECURSIONOK(client))
|
|
|
2c0af7 |
+ {
|
|
|
2c0af7 |
+ if (dns_rdataset_isassociated(rdataset))
|
|
|
2c0af7 |
+ dns_rdataset_disassociate(rdataset);
|
|
|
2c0af7 |
+ if (sigrdataset != NULL &&
|
|
|
2c0af7 |
+ dns_rdataset_isassociated(sigrdataset))
|
|
|
2c0af7 |
+ dns_rdataset_disassociate(sigrdataset);
|
|
|
2c0af7 |
+ if (node != NULL)
|
|
|
2c0af7 |
+ dns_db_detachnode(db, &node);
|
|
|
2c0af7 |
+
|
|
|
2c0af7 |
+ result = query_recurse(client, qtype,
|
|
|
2c0af7 |
+ client->query.qname,
|
|
|
2c0af7 |
+ NULL, NULL, resuming);
|
|
|
2c0af7 |
+ if (result == ISC_R_SUCCESS) {
|
|
|
2c0af7 |
+ client->query.attributes |=
|
|
|
2c0af7 |
+ NS_QUERYATTR_RECURSING;
|
|
|
2c0af7 |
+ if (dns64)
|
|
|
2c0af7 |
+ client->query.attributes |=
|
|
|
2c0af7 |
+ NS_QUERYATTR_DNS64;
|
|
|
2c0af7 |
+ if (dns64_exclude)
|
|
|
2c0af7 |
+ client->query.attributes |=
|
|
|
2c0af7 |
+ NS_QUERYATTR_DNS64EXCLUDE;
|
|
|
2c0af7 |
+ } else
|
|
|
2c0af7 |
+ RECURSE_ERROR(result);
|
|
|
2c0af7 |
+ goto cleanup;
|
|
|
2c0af7 |
+ }
|
|
|
2c0af7 |
+
|
|
|
2c0af7 |
#ifdef ALLOW_FILTER_AAAA_ON_V4
|
|
|
2c0af7 |
/*
|
|
|
2c0af7 |
* Optionally hide AAAAs from IPv4 clients if there is an A.
|
|
|
2c0af7 |
--
|
|
|
2c0af7 |
2.14.4
|
|
|
2c0af7 |
|