MSVSphere Packaging Team
6 months ago
parent
d63de097e8
commit
d756a539e6
@ -0,0 +1,52 @@
|
|||||||
|
From e91ab7758bed0cf3dcf8ed745f91063d7ec4011c Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <michal@isc.org>
|
||||||
|
Date: Thu, 4 Jan 2024 13:39:27 +0100
|
||||||
|
Subject: [PATCH] Fix map offsets in the "masterformat" system test
|
||||||
|
|
||||||
|
The "masterformat" system test attempts to check named-checkzone
|
||||||
|
behavior when it is fed corrupt map-format zone files. However, despite
|
||||||
|
the RBTDB and RBT structures having evolved over the years, the offsets
|
||||||
|
at which a valid map-format zone file is malformed by the "masterformat"
|
||||||
|
test have not been updated accordingly, causing the relevant checks to
|
||||||
|
introduce a different type of corruption than they were originally meant
|
||||||
|
to cause:
|
||||||
|
|
||||||
|
- the "bad node header" check originally mangled the 'type' member of
|
||||||
|
the rdatasetheader_t structure for cname.example.nil,
|
||||||
|
|
||||||
|
- the "bad node data" check originally mangled the 'serial' and
|
||||||
|
'rdh_ttl' members of the rdatasetheader_t structure for
|
||||||
|
aaaa.example.nil.
|
||||||
|
|
||||||
|
Update the offsets at which the map-format zone file is malformed at by
|
||||||
|
the "masterformat" system test so that the relevant checks fulfill their
|
||||||
|
original purpose again.
|
||||||
|
---
|
||||||
|
bin/tests/system/masterformat/tests.sh | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/bin/tests/system/masterformat/tests.sh b/bin/tests/system/masterformat/tests.sh
|
||||||
|
index 364a0d2..bb4e6ec 100755
|
||||||
|
--- a/bin/tests/system/masterformat/tests.sh
|
||||||
|
+++ b/bin/tests/system/masterformat/tests.sh
|
||||||
|
@@ -295,7 +295,7 @@ status=$((status+ret))
|
||||||
|
echo_i "checking corrupt map files fail to load (bad node header) ($n)"
|
||||||
|
ret=0
|
||||||
|
cp map.5 badmap
|
||||||
|
-stomp badmap 2754 2 99
|
||||||
|
+stomp badmap 3706 2 99
|
||||||
|
$CHECKZONE -D -f map -F text -o text.5 example.nil badmap > /dev/null
|
||||||
|
[ $? = 1 ] || ret=1
|
||||||
|
n=$((n+1))
|
||||||
|
@@ -305,7 +305,7 @@ status=$((status+ret))
|
||||||
|
echo_i "checking corrupt map files fail to load (bad node data) ($n)"
|
||||||
|
ret=0
|
||||||
|
cp map.5 badmap
|
||||||
|
-stomp badmap 2897 5 127
|
||||||
|
+stomp badmap 3137 5 127
|
||||||
|
$CHECKZONE -D -f map -F text -o text.5 example.nil badmap > /dev/null
|
||||||
|
[ $? = 1 ] || ret=1
|
||||||
|
n=$((n+1))
|
||||||
|
--
|
||||||
|
2.44.0
|
||||||
|
|
||||||
@ -0,0 +1,53 @@
|
|||||||
|
From c532af966a7328f0e518273bc1f6051bb9d9e995 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mark Andrews <marka@isc.org>
|
||||||
|
Date: Thu, 12 Oct 2023 10:19:38 +1100
|
||||||
|
Subject: [PATCH] Update b.root-servers.net IP addresses
|
||||||
|
|
||||||
|
This covers both root hints and the default primaries for the root
|
||||||
|
zone mirror. The official change date is Nov 27, 2023.
|
||||||
|
|
||||||
|
(cherry picked from commit 2ca2f7e9852a3d6e93f065c01ea4679f723688f7)
|
||||||
|
---
|
||||||
|
bin/named/config.c | 4 ++--
|
||||||
|
lib/dns/rootns.c | 4 ++--
|
||||||
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/bin/named/config.c b/bin/named/config.c
|
||||||
|
index 8c6f90c..c37015f 100644
|
||||||
|
--- a/bin/named/config.c
|
||||||
|
+++ b/bin/named/config.c
|
||||||
|
@@ -292,14 +292,14 @@ view \"_bind\" chaos {\n\
|
||||||
|
"# END MANAGED KEYS\n\
|
||||||
|
\n\
|
||||||
|
primaries " DEFAULT_IANA_ROOT_ZONE_PRIMARIES " {\n\
|
||||||
|
- 2001:500:200::b; # b.root-servers.net\n\
|
||||||
|
+ 2801:1b8:10::b; # b.root-servers.net\n\
|
||||||
|
2001:500:2::c; # c.root-servers.net\n\
|
||||||
|
2001:500:2f::f; # f.root-servers.net\n\
|
||||||
|
2001:500:12::d0d; # g.root-servers.net\n\
|
||||||
|
2001:7fd::1; # k.root-servers.net\n\
|
||||||
|
2620:0:2830:202::132; # xfr.cjr.dns.icann.org\n\
|
||||||
|
2620:0:2d0:202::132; # xfr.lax.dns.icann.org\n\
|
||||||
|
- 199.9.14.201; # b.root-servers.net\n\
|
||||||
|
+ 170.247.170.2; # b.root-servers.net\n\
|
||||||
|
192.33.4.12; # c.root-servers.net\n\
|
||||||
|
192.5.5.241; # f.root-servers.net\n\
|
||||||
|
192.112.36.4; # g.root-servers.net\n\
|
||||||
|
diff --git a/lib/dns/rootns.c b/lib/dns/rootns.c
|
||||||
|
index 885c2fb..b06d247 100644
|
||||||
|
--- a/lib/dns/rootns.c
|
||||||
|
+++ b/lib/dns/rootns.c
|
||||||
|
@@ -52,8 +52,8 @@ static char root_ns[] =
|
||||||
|
". 518400 IN NS M.ROOT-SERVERS.NET.\n"
|
||||||
|
"A.ROOT-SERVERS.NET. 3600000 IN A 198.41.0.4\n"
|
||||||
|
"A.ROOT-SERVERS.NET. 3600000 IN AAAA 2001:503:BA3E::2:30\n"
|
||||||
|
- "B.ROOT-SERVERS.NET. 3600000 IN A 199.9.14.201\n"
|
||||||
|
- "B.ROOT-SERVERS.NET. 3600000 IN AAAA 2001:500:200::b\n"
|
||||||
|
+ "B.ROOT-SERVERS.NET. 3600000 IN A 170.247.170.2\n"
|
||||||
|
+ "B.ROOT-SERVERS.NET. 3600000 IN AAAA 2801:1b8:10::b\n"
|
||||||
|
"C.ROOT-SERVERS.NET. 3600000 IN A 192.33.4.12\n"
|
||||||
|
"C.ROOT-SERVERS.NET. 3600000 IN AAAA 2001:500:2::c\n"
|
||||||
|
"D.ROOT-SERVERS.NET. 3600000 IN A 199.7.91.13\n"
|
||||||
|
--
|
||||||
|
2.43.0
|
||||||
|
|
||||||
Loading…
Reference in new issue