]>
git.ipfire.org Git - thirdparty/pdns.git/log
Remi Gacogne [Fri, 25 Mar 2022 08:45:55 +0000 (09:45 +0100)]
docs: Pin jinja2 to < 3.1.0
Jinja2 3.1.0 removed deprecated code that is still used by sphinx
1.8.x, and it looks like our custom sphinx extensions are not working
with more recent versions of sphinx..
See:
- https://github.com/pallets/jinja/issues/1631
- https://github.com/readthedocs/readthedocs.org/issues/9037
and
- https://github.com/PowerDNS/pdns/pull/7712
The exact error is:
```
Extension error:
Could not import extension sphinx.builders.latex (exception: cannot import name 'contextfunction' from 'jinja2' (/dnsdist/pdns/dnsdistdist/.venv/lib/python3.7/site-packages/jinja2/__init__.py))
```
(cherry picked from commit
92ad29702011ac7cbd0d7d118ba612e7e07cedbe )
Otto Moerbeek [Tue, 8 Mar 2022 08:19:31 +0000 (09:19 +0100)]
Merge pull request #11400 from omoerbeek/backport-11044-to-rec-4.4.x
rec: Backport 11044 to rec 4.4.x: Fix v6 test setup and start using a more modern auth on circleci
Otto [Mon, 29 Nov 2021 13:48:09 +0000 (14:48 +0100)]
Fix error in test zone that auth-45 does not like
(cherry picked from commit
f1f41a8aa9299a4d8bf369c4fc0cb611f5b979cd )
Otto [Mon, 29 Nov 2021 11:52:09 +0000 (12:52 +0100)]
One more occurence of --local-ipv6
(cherry picked from commit
9b3fc866b7f8133d4317aec9253e4b5fb0a385f9 )
Otto [Mon, 29 Nov 2021 10:56:25 +0000 (11:56 +0100)]
Fix v6 setup and start using a more modern auth on circleci
(cherry picked from commit
2d0fc474f8b03b536a95c6b9b05e96c6e8c51e30 )
Peter van Dijk [Thu, 3 Feb 2022 10:22:04 +0000 (11:22 +0100)]
Merge pull request #11277 from Habbie/backport-11262-to-rec-4.4.x
rec-4.4.x: builder: migrate EL8 builds to oraclelinux, rename centos8 to el8 where possible
Peter van Dijk [Mon, 31 Jan 2022 17:15:14 +0000 (18:15 +0100)]
builder: add el-7 alias for centos-7
(cherry picked from commit
6bd3c9bb23f5dfc385a66647ab175ec2812d6617 )
Peter van Dijk [Mon, 31 Jan 2022 15:28:04 +0000 (16:28 +0100)]
builder: archs for oraclelinux-8; el-8 symlinks
(cherry picked from commit
dee53cf16161a6c45560475b647de420842532ef )
Otto Moerbeek [Tue, 1 Feb 2022 09:41:55 +0000 (10:41 +0100)]
Merge pull request #11265 from omoerbeek/backport-11208-to-rec-4.4.x
rec: backport to rec-4.4.x: CI: dnspython 2.2.0 breaks auth and ixfrdist testing, pin to 2.1.0
Peter van Dijk [Tue, 18 Jan 2022 15:40:52 +0000 (16:40 +0100)]
CI: dnspython 2.2.0 breaks auth and ixfrdist testing, pin to 2.1.0
(cherry picked from commit
46a40ed033d64f58aa30013d7e68daa5b5e8d615 )
Otto Moerbeek [Tue, 23 Nov 2021 09:56:47 +0000 (10:56 +0100)]
Merge pull request #11023 from omoerbeek/backport-11010-to-rec-4.4.x
rec: backport 11010 to rec-4.4.x: Do cache negcache results, even when wasVariable() is true
Otto [Fri, 19 Nov 2021 10:57:28 +0000 (11:57 +0100)]
Do cache negcache results, even when wasVariable() is true
See https://datatracker.ietf.org/doc/html/rfc7871#section-7.4
Fixes #10994
(cherry picked from commit
2bcec14adbffbf4b28d698cb607877fb96054e87 )
Otto Moerbeek [Wed, 27 Oct 2021 13:00:42 +0000 (15:00 +0200)]
Merge pull request #10910 from omoerbeek/backport-10908-to-rec-4.4.x
rec: Backport 10908 to rec-4.4.x: A SHA-384 DS should not trump a SHA-256 one, so only potentially zap SHA-1
Otto Moerbeek [Wed, 27 Oct 2021 13:00:31 +0000 (15:00 +0200)]
Merge pull request #10909 from omoerbeek/backport-10905-to-rec-4.4.x
rec: Backport of 10905: wipe-cache-typed should check if a qtype arg is present and valid
Remi Gacogne [Wed, 27 Oct 2021 12:39:26 +0000 (14:39 +0200)]
Merge pull request #10915 from rgacogne/rec44-docutils-pin
rec-4.4.x: Pin docutils to < 0.18 for now
Remi Gacogne [Tue, 26 Oct 2021 14:07:03 +0000 (16:07 +0200)]
Pin docutils to < 0.18 for now
We will have to deal with that pain later, but let's unbreak our
CI first.
(cherry picked from commit
2503af018b72112a2422ce895d9e7418155cbc9f )
Otto [Wed, 27 Oct 2021 07:38:10 +0000 (09:38 +0200)]
wipe-cache-typed should check if a qtype arg is present and valid
(cherry picked from commit
a721f7b21a75cefaa189bf84b14979facde7d3ab )
Otto [Wed, 27 Oct 2021 10:01:09 +0000 (12:01 +0200)]
A SHA-384 DS should not trump a SHA-256 one, so only potentially zap SHA-1
(cherry picked from commit
a660ce6dbfc4182922eea8e548eb504af31b6cc1 )
Otto Moerbeek [Wed, 6 Oct 2021 11:23:29 +0000 (13:23 +0200)]
Merge pull request #10805 from Habbie/backport-9712-to-rec-4.4.x
rec-4.4.x: switch to py3 (backport of #9712 plus tweaks)
Peter van Dijk [Wed, 6 Oct 2021 10:46:39 +0000 (12:46 +0200)]
Revert "Adapt the regression test to allow absense of deviceName etc."
This reverts commit
e596ec138125ea5ccc37f7260767bd94b65b64b6 .
Peter van Dijk [Wed, 6 Oct 2021 09:54:17 +0000 (11:54 +0200)]
enable more tests
Peter van Dijk [Wed, 6 Oct 2021 08:19:20 +0000 (10:19 +0200)]
remove empty files from merge resolving
Peter van Dijk [Tue, 17 Nov 2020 09:57:45 +0000 (10:57 +0100)]
auth-py tests: py3
(cherry picked from commit
00294227045a32a827ce31138bb31756e178698b )
Kevin P. Fleming [Tue, 17 Nov 2020 02:45:37 +0000 (21:45 -0500)]
BaseHTTPServer is now http.server in Python 3
(cherry picked from commit
12c2f4d7bf80e72eeb1f33889a39d15931bd22d2 )
Kevin P. Fleming [Tue, 17 Nov 2020 01:58:01 +0000 (20:58 -0500)]
Suppress Python 3 parsing of Unicode literals
(cherry picked from commit
bbaf474cf7a72a98088005b4e6e9dbf07f241cd8 )
Peter van Dijk [Tue, 17 Nov 2020 00:59:35 +0000 (19:59 -0500)]
Additional fixes for Python 3 conversion
(cherry picked from commit
2f08b8d676bdaa4205c76565aa83a743e1f7b97f )
Peter van Dijk [Fri, 13 Nov 2020 18:43:35 +0000 (19:43 +0100)]
add venv to Dockerfile-auth for JSON API file
(cherry picked from commit
f94f9c6300c60a7d984d6348aa05885388b9e2db )
Peter van Dijk [Fri, 13 Nov 2020 16:03:17 +0000 (17:03 +0100)]
recursor DNSSEC regression tests: skip debug cachedump
(cherry picked from commit
15a0444746472826ba88439407f0234f5f17ba2f )
Peter van Dijk [Fri, 13 Nov 2020 11:40:23 +0000 (12:40 +0100)]
recursor DNSSEC regression tests: migrate to Python 3
(cherry picked from commit
3d144e241348afd5706a792bae7488786b144bc8 )
Kevin P. Fleming [Fri, 13 Nov 2020 22:35:34 +0000 (17:35 -0500)]
Use Python 3 in build system
The various tasks in the build system which use Python
will now use Python 3 (3.6 or later) and the 'venv' module,
instead of the 'virtualenv' tool which was primarily used
with Python 2.7.
(cherry picked from commit
9850825187bf0c493ca5960a4cd84d50ee75c265 )
Otto Moerbeek [Wed, 6 Oct 2021 07:47:28 +0000 (09:47 +0200)]
Merge pull request #10802 from omoerbeek/backport-10768-to-rec-4.4.x
rec: Backport 10768 to rec 4.4.x: Use the correct RPZ policy name when loading via XFR
Remi Gacogne [Tue, 28 Sep 2021 09:12:23 +0000 (11:12 +0200)]
rec: Use the correct RPZ policy name when loading via XFR
This commit fixes two issues:
- if the existing zone name is not empty we should use it, instead of
the zone domain
- if the zone domain has to be used, it should not include a final dot
(cherry picked from commit
3e86a970828dda814a140c9613311a8507c3c458 )
Otto Moerbeek [Fri, 17 Sep 2021 14:40:34 +0000 (16:40 +0200)]
Merge pull request #10722 from omoerbeek/backport-10721-to-rec-4.4.x
rec: Backport 10721 to rec 4.4.x: require nose >= 1.3.7 everywhere
Peter van Dijk [Tue, 14 Sep 2021 14:06:55 +0000 (16:06 +0200)]
require nose >= 1.3.7 everywhere
(cherry picked from commit
8e8be088de0634fc561f5c7f6e26d6ed03f401e8 )
Otto Moerbeek [Tue, 14 Sep 2021 11:01:49 +0000 (13:01 +0200)]
Merge pull request #10719 from omoerbeek/rel/rec-4.4.x
rec 4.4.x: Update builder
Otto [Mon, 13 Sep 2021 12:56:29 +0000 (14:56 +0200)]
Update builder so that it prints targets one-per-line as buildbot requires
Otto Moerbeek [Mon, 13 Sep 2021 07:20:50 +0000 (09:20 +0200)]
Merge pull request #10654 from omoerbeek/backport-10643-to-rec-4.4.x
rec: Backport 10643 to rec 4.4.x: NS from the cache could be a forwarder
Otto [Wed, 18 Aug 2021 07:24:45 +0000 (09:24 +0200)]
Also check if the remoteIP is one of the IPs we would have forwarded to,
even if it's coming from the cache.
Otto [Wed, 11 Aug 2021 11:14:37 +0000 (13:14 +0200)]
If we get an NS from the cache, it still could be one forwarding applies to.
Take that into acount when determining dont-query status. Should fix #10638.
(cherry picked from commit
c03df9bb6f8cd71a67ef9505fcafa27d514a68ad )
Otto Moerbeek [Mon, 9 Aug 2021 06:21:14 +0000 (08:21 +0200)]
Merge pull request #10628 from omoerbeek/backport-10627-to-rec-4.4.x
rec: backport 10627 to rec-4.4.x: Check in more places if the policy has been updated before using or modifying it.
Otto [Tue, 3 Aug 2021 07:08:09 +0000 (09:08 +0200)]
Check in more places if the config policy has been updated before
using or modifying it.
(cherry picked from commit
0c98e3de2cf1daae3f7034803668c1ac10fefe49 )
Otto Moerbeek [Wed, 28 Jul 2021 07:30:26 +0000 (09:30 +0200)]
Merge pull request #10615 from omoerbeek/backport-10455-to-rec-4.4.x
rec: backport 10455 to rec-4.4.x: builder rpmbuild: run yum upgrade first
Peter van Dijk [Thu, 27 May 2021 16:04:46 +0000 (18:04 +0200)]
builder rpmbuild: run yum upgrade first
(cherry picked from commit
912729cf22c5303fa4e0136a639132ca940a186f )
Remi Gacogne [Mon, 19 Jul 2021 11:30:17 +0000 (13:30 +0200)]
Merge pull request #10580 from pieterlexis/44-backport-10555
rec: backport #10555 to 4.4.x: Work around clueless servers sending AA=0 answers
Pieter Lexis [Mon, 5 Jul 2021 12:19:12 +0000 (14:19 +0200)]
backport 10555 to 4.4
Otto Moerbeek [Tue, 11 May 2021 12:23:17 +0000 (14:23 +0200)]
Merge pull request #10390 from omoerbeek/rec-4.4.x-zero-ecs-sizecheck
Rec 4.4.x: zero ecs sizecheck
Otto Moerbeek [Tue, 11 May 2021 11:52:28 +0000 (13:52 +0200)]
Add corresponding regress test
Otto [Tue, 11 May 2021 11:48:27 +0000 (13:48 +0200)]
Check if we have room before adding zero ecs scope ENDS value
Otto Moerbeek [Tue, 11 May 2021 11:17:13 +0000 (13:17 +0200)]
Merge pull request #10384 from omoerbeek/backport-10329-to-rec-4.4.x
rec: Backport 10329 to rec-4.4.x: boost 1.76 containers: use standard exceptions
Otto Moerbeek [Tue, 11 May 2021 11:17:00 +0000 (13:17 +0200)]
Merge pull request #10383 from omoerbeek/backport-10303-to-rec-4.4.x
rec: Backport 10303 to rec 4.4.x: Use the correct ECS address when proxy-protocol is enabled
Otto Moerbeek [Tue, 11 May 2021 10:15:57 +0000 (12:15 +0200)]
Remove not-yet-relevant regress check
Otto Moerbeek [Tue, 11 May 2021 09:00:41 +0000 (11:00 +0200)]
Merge pull request #10385 from omoerbeek/backport-10353-to-rec-4.4.x
rec: Backport 10353 to rec 4.4.x: Apply dns64 on RPZ hits generated after a gettag_ffi hit
Otto Moerbeek [Tue, 11 May 2021 09:00:27 +0000 (11:00 +0200)]
Merge pull request #10387 from omoerbeek/rec-4.4.x-add-fuzz-corpus
Rec 4.4.x: add fuzz corpus files
Otto Moerbeek [Tue, 11 May 2021 09:00:14 +0000 (11:00 +0200)]
Merge pull request #10386 from omoerbeek/rec-4.4.x-no-cxx17
rec: 4.4.x codebase is not c++17, so don't use static_assert with 1 arg.
Otto Moerbeek [Tue, 11 May 2021 08:59:56 +0000 (10:59 +0200)]
Merge pull request #10382 from omoerbeek/backport-10252-to-rec-4.4.x
rec: Backport 10252 to rec-4.4.x: Fix the package version _on_ prerelease tags
Otto [Tue, 11 May 2021 07:55:52 +0000 (09:55 +0200)]
Add missing fuzzing corpus files
Otto [Mon, 10 May 2021 14:25:56 +0000 (16:25 +0200)]
rec 4.4.x codebase is not c++17, so don't use static_assert with 1 arg.
Remi Gacogne [Tue, 4 May 2021 16:30:47 +0000 (18:30 +0200)]
rec: Test the most simple condition first
Co-authored-by: Otto Moerbeek <otto.moerbeek@open-xchange.com>
(cherry picked from commit
89461c55042e1f0f7d17a511ae3d6c7c39602954 )
Remi Gacogne [Tue, 4 May 2021 12:56:40 +0000 (14:56 +0200)]
rec: Add a regression test for gettag_ffi, RPZ and DNS64 interaction
(cherry picked from commit
76b47869c7902da25036c76ec4cd98fe23a51827 )
Remi Gacogne [Tue, 4 May 2021 10:29:32 +0000 (12:29 +0200)]
rec: Apply dns64 on RPZ hits generated after a gettag_ffi hit
We do special case the qname RPZ processing after a gettag_ffi hit,
leading to dns64 to not be applied in that case. This commit adds
dns64 handling to the special case.
(cherry picked from commit
92f829c42ef82b6d5d0804886519536137925f23 )
Peter van Dijk [Fri, 23 Apr 2021 13:40:43 +0000 (15:40 +0200)]
boost 1.76 containers: use standard exceptions
(cherry picked from commit
311f26839819062ced8697686372b6c6b2210bdf )
Otto [Mon, 10 May 2021 14:09:17 +0000 (16:09 +0200)]
Revert whitelist -> allow-list change
Remi Gacogne [Mon, 19 Apr 2021 12:06:26 +0000 (14:06 +0200)]
rec: Fix the proxy protocol regression tests
(cherry picked from commit
1d3ea4cf67b5e1565ed619f5015420481e1c87f3 )
Remi Gacogne [Mon, 19 Apr 2021 09:15:43 +0000 (11:15 +0200)]
rec: Replace deprecated edns-subnet-whitelist with edns-subnet-allow-list
(cherry picked from commit
3be6dde85dda49352642681813753454e5f41525 )
Remi Gacogne [Mon, 19 Apr 2021 09:13:47 +0000 (11:13 +0200)]
rec: Add regression tests for Proxy Protocol / ECS interaction
(cherry picked from commit
9166ee1b3fc9d5df9b93570d883cf154aa98e425 )
Remi Gacogne [Mon, 19 Apr 2021 08:09:40 +0000 (10:09 +0200)]
rec: Use the correct ECS address when proxy-protocol is enabled
(cherry picked from commit
2199aa19f92415dc9ecdfafbd9c9ce08327f54b8 )
Pieter Lexis [Wed, 31 Mar 2021 14:04:27 +0000 (16:04 +0200)]
Fix the package version _on_ prerelease tags
Closes #9842
(cherry picked from commit
121a191d5ecd24818053a39013608e424a36142a )
Otto Moerbeek [Wed, 28 Apr 2021 10:21:07 +0000 (12:21 +0200)]
Merge pull request #10314 from omoerbeek/backport-10286-to-rec-4.4.x
rec: Backport 10286 to rec 4.4.x: rpz dumper: stop generating double zz labels on networks that start with zeroes
Otto Moerbeek [Wed, 21 Apr 2021 09:02:25 +0000 (11:02 +0200)]
Merge pull request #10313 from omoerbeek/backport-10291-to-rec-4.4.x
rec: backport 10291 to rec-4.4.x: Exception loading the RPZ seedfile is not fatal.
Otto [Tue, 13 Apr 2021 13:16:09 +0000 (15:16 +0200)]
Exception loading the RPZ seedfile is not fatal.
Catch PDNSException and clear on failure.
(cherry picked from commit
a47cc75dfa7519bcf7b31cee511852ae954a50f8 )
Peter van Dijk [Wed, 14 Apr 2021 16:46:27 +0000 (18:46 +0200)]
the code is not glibc specific
(cherry picked from commit
245abe4da5829bcf39953cfe06c0ef6ab8f6ecd7 )
Peter van Dijk [Wed, 14 Apr 2021 16:28:20 +0000 (18:28 +0200)]
comments from code review
(cherry picked from commit
34b0536b713515b4cc89d8a28ea27822ef0880dc )
Peter van Dijk [Wed, 14 Apr 2021 16:26:09 +0000 (18:26 +0200)]
auto, reinterpret_cast
Co-authored-by: Remi Gacogne <rgacogne+github@valombre.net>
(cherry picked from commit
de769ee3f68d9e940cd10610e7a68b03ce339bda )
Peter van Dijk [Tue, 13 Apr 2021 19:06:33 +0000 (21:06 +0200)]
add tests
Co-authored-by: Otto Moerbeek <otto.moerbeek@open-xchange.com>
(cherry picked from commit
0d70e98b423fed67efff4ea82db7eb7d6552a64c )
Peter van Dijk [Mon, 12 Apr 2021 10:24:17 +0000 (12:24 +0200)]
rpz dumper: stop generating double zz labels on networks that start with zeroes
(partial rewrite; adds tests)
(cherry picked from commit
bbe6cfec2b5a0b65a7183c04a4d088f1fcc87ba7 )
Otto Moerbeek [Mon, 29 Mar 2021 15:59:13 +0000 (17:59 +0200)]
Merge pull request #10240 from omoerbeek/backport-10238-to-rec-4.4.x
rec: Backport 10238 to rec 4.4.x: More fail-safe handling of NOD files
Otto Moerbeek [Mon, 29 Mar 2021 15:59:00 +0000 (17:59 +0200)]
Merge pull request #10227 from omoerbeek/backport-10111-to-rec-4.4.x
rec: Backport 10111 to rec 4.4.x: Handle policy (if needed) after postresolve
Otto [Mon, 29 Mar 2021 15:10:30 +0000 (17:10 +0200)]
Fix make_unique to be c++11 compatibe, use explicit unique_ptr ct
Otto [Mon, 29 Mar 2021 13:27:43 +0000 (15:27 +0200)]
Safe tmp file handling, basic sanity check on size of data.
(cherry picked from commit
852d4e70c09dd9b41d9aa2a988a666b0cb749d97 )
Otto [Mon, 29 Mar 2021 10:07:14 +0000 (12:07 +0200)]
Move the opening of the file to write a bit down
(cherry picked from commit
5ef38b0c7b61e819773765d87b0fe6061cd0be7a )
Otto [Mon, 29 Mar 2021 10:05:55 +0000 (12:05 +0200)]
namespace filesystem = boost::filesystem
(cherry picked from commit
dec872ee807caa32eab6f75e36db4feb16f2f6ea )
Otto [Mon, 29 Mar 2021 09:49:34 +0000 (11:49 +0200)]
Zap tmp files; use random suffix and fix leak by using smart pointer.
(cherry picked from commit
e672ad6db7e9d0a98569656a4c0701121715b842 )
Otto [Mon, 29 Mar 2021 08:40:37 +0000 (10:40 +0200)]
More fail-safe handling of NOD files
(cherry picked from commit
7b4cc738ffaaec7173f39fc140799f2200d93e61 )
Otto Moerbeek [Mon, 29 Mar 2021 10:25:07 +0000 (12:25 +0200)]
Merge pull request #10226 from omoerbeek/backport-10064-to-rec-4.4.x
rec: Backport 10064 to 4.4.x: Return current rcode instead of 0 if there are no CNAME records to follow
Otto Moerbeek [Mon, 29 Mar 2021 10:24:52 +0000 (12:24 +0200)]
Merge pull request #10225 from omoerbeek/backport-10042-to-rec-4.4.x
Backport 10042 to rec 4.4.x: dockerfiles: Ensure version number is correct for releases
Otto Moerbeek [Mon, 29 Mar 2021 06:56:44 +0000 (08:56 +0200)]
Merge pull request #10224 from omoerbeek/backport-9883-to-rec-4.4.x
rec: Backport 9883 to rec 4.4.x: Lookup DS entries before CNAME entries
Otto Moerbeek [Mon, 29 Mar 2021 06:46:50 +0000 (08:46 +0200)]
Merge pull request #10222 from omoerbeek/backport-9860-to-rec-4.4.x
rec: backport 9860 to 4.4.x: Get rid of warnings when compiling with Boost 1.74
Otto [Fri, 26 Mar 2021 15:30:01 +0000 (16:30 +0100)]
Review comments: clean d_from if needed and a merge oversight.
Otto [Fri, 26 Mar 2021 10:10:00 +0000 (11:10 +0100)]
Reformat
Otto Moerbeek [Fri, 26 Mar 2021 10:05:59 +0000 (11:05 +0100)]
Merge pull request #10221 from omoerbeek/backport-9856-to-rec-4.4.x
rec: Backport 9856 to rec 4.4.x: Use a short-lived NSEC3 hashes cache for denial validation
Otto Moerbeek [Fri, 26 Mar 2021 10:05:44 +0000 (11:05 +0100)]
Merge pull request #10220 from omoerbeek/backport-9827-to-rec-4.4.x
rec: backport 9827 to rec 4.4.x: stop using travis
Otto [Fri, 26 Mar 2021 09:59:15 +0000 (10:59 +0100)]
Partial backport of #10111: Handle policy (if needed) after postresolve
I did not take the Lua changes, as there is a (slight) chance they are disruptive.
Otto [Fri, 5 Feb 2021 15:18:55 +0000 (16:18 +0100)]
Return current rcode instead of 0 if there are no CNAME records to follow.
Note that this is a change in behaviour. While it is for the good, it might
be existing code depends on the old 0 value...
(cherry picked from commit
558d47eba7d2edd3fb5991af428d9d432fec1dfa )
Pieter Lexis [Tue, 2 Feb 2021 12:31:15 +0000 (13:31 +0100)]
docker: use unbuffered output in init
(cherry picked from commit
aa665201200100c9f97969c8a9907d775d55adbe )
Pieter Lexis [Tue, 2 Feb 2021 12:28:04 +0000 (13:28 +0100)]
dockerfiles: Ensure version number is correct for releases
(cherry picked from commit
a508963dc3a36883b24db67e285c9e0481b84fb0 )
Remi Gacogne [Tue, 5 Jan 2021 08:54:18 +0000 (09:54 +0100)]
rec: Remove unneeded 'static'
(cherry picked from commit
3eff7a0d105c6fa6342a82a217e1f96217824dbf )
Otto [Fri, 26 Mar 2021 08:44:00 +0000 (09:44 +0100)]
Resolve merge issues
Remi Gacogne [Thu, 17 Dec 2020 13:45:59 +0000 (14:45 +0100)]
rec: Store the zone and remote server IP in the records cache
(cherry picked from commit
928c0f926859012945a223d28ffd3ce3f3ba2ac1 )
Remi Gacogne [Wed, 16 Dec 2020 16:40:15 +0000 (17:40 +0100)]
rec: Add a unit test for the 'DS entry expired but CNAME is here' issue
(cherry picked from commit
b26212090b16c0a4e7f583e10586e5e85e2b66ae )
Remi Gacogne [Wed, 16 Dec 2020 14:51:19 +0000 (15:51 +0100)]
rec: Lookup DS entries before CNAME entries
When we are looking for a DS, we want to do the non-CNAME cache check first
because we can actually have a DS (from the parent zone) AND a CNAME (from
the child zone), and what we really want is the DS.
(cherry picked from commit
38263b88f2b3fa979cb1067ce602f48a1a4678bb )