- Update contrib/aaaa-filter-iterator.patch for the recent

  generate_sub_request() change and to apply cleanly.

diff --git a/contrib/aaaa-filter-iterator.patch b/contrib/aaaa-filter-iterator.patch
index b5c5268223d1ba83e1b7d40bba1ff8c4bc22a83b..9881bde892adbeb19e5e19747110e2485e6422e8 100644 (file)
--- a/contrib/aaaa-filter-iterator.patch
+++ b/contrib/aaaa-filter-iterator.patch
@@ -13,9 +13,9 @@ Index: trunk/doc/unbound.conf.5.in
 +This also causes an additional A query to be sent for each AAAA query.
 +This breaks DNSSEC!
 +.TP
- .B private\-address: \fI<IP address or subnet>
- Give IPv4 of IPv6 addresses or classless subnets. These are addresses
- on your private network, and are not allowed to be returned for
+ .B aggressive\-nsec: \fI<yes or no>
+ Aggressive NSEC uses the DNSSEC NSEC chain to synthesize NXDOMAIN
+ and other denials, using information from previous NXDOMAINs answers.
 Index: trunk/iterator/iter_scrub.c
 ===================================================================
 --- trunk/iterator/iter_scrub.c        (revision 4357)
@@ -125,7 +125,7 @@ Index: trunk/iterator/iterator.c
 + * ASN: This event state was added as an intermediary step between
 + * QUERYTARGETS_STATE and the next step, in order to cast a subquery for the
 + * purpose of caching A records for the queried name.
-+ * 
++ *
 + * @param qstate: query state.
 + * @param iq: iterator query state.
 + * @param ie: iterator shared global environment.
@@ -147,9 +147,9 @@ Index: trunk/iterator/iterator.c
 +
 +      /* re-throw same query, but with a different type */
 +      if(!generate_sub_request(iq->qchase.qname,
-+              iq->qchase.qname_len, LDNS_RR_TYPE_A,
++              iq->qchase.qname_len, LDNS_RR_TYPE_A,
 +              iq->qchase.qclass, qstate, id, iq,
-+              INIT_REQUEST_STATE, FINISHED_STATE, &subq, 1)) {
++              INIT_REQUEST_STATE, FINISHED_STATE, &subq, 1, 0)) {
 +              log_nametypeclass(VERB_ALGO, "ASN-AAAA-filter: failed "
 +                      "preloading of A record for",
 +                      iq->qchase.qname, LDNS_RR_TYPE_A,
@@ -188,7 +188,7 @@ Index: trunk/iterator/iterator.c
        return 0;
  }
  
-+/** 
++/**
 + * ASN: Do final processing on responses to A queries originated from AAAA
 + * queries. Events reach this state after the iterative resolution algorithm
 + * terminates.

diff --git a/doc/Changelog b/doc/Changelog
index 75b3822d3a87ed2a9a99e11076d729cb39ea0059..0fa850ed051eb3309fc0898327186398b9f9c0c1 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+25 May 2020: George
+       - Update contrib/aaaa-filter-iterator.patch for the recent
+         generate_sub_request() change and to apply cleanly.
+
 21 May 2020: George
        - Fix for integer overflow when printing RDF_TYPE_TIME.