From: Michał Kępień <michal@isc.org>
Date: Thu, 7 Mar 2024 08:42:38 +0000 (+0100)
Subject: Account for changes to struct dns_rbtnode
X-Git-Tag: v9.16.49~2^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=b138931fc017605e16af80af59272948b7c8bd96;p=thirdparty%2Fbind9.git

Account for changes to struct dns_rbtnode

Commit eba7fb5f9f4925bbfd0d85847117847586b1ee9e modified the definition
of struct dns_rbtnode.  Doing that changes the layout of map-format zone
files.  Bump MAPAPI and update the offsets used in map-format zone file
checks in the "masterformat" system test, as these changes were
inadvertently omitted from the aforementioned change.

(cherry picked from commit 52fe0b6be7cb99f2e13462ef86a31cc74185162d)
---

diff --git a/bin/tests/system/masterformat/tests.sh b/bin/tests/system/masterformat/tests.sh
index e83f551f611..3a4eb3e1160 100755
--- a/bin/tests/system/masterformat/tests.sh
+++ b/bin/tests/system/masterformat/tests.sh
@@ -293,7 +293,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 3706 2 99
+stomp badmap 3578 2 99
 $CHECKZONE -D -f map -F text -o text.5 example.nil badmap >/dev/null
 [ $? = 1 ] || ret=1
 n=$((n + 1))
@@ -303,7 +303,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 3137 5 127
+stomp badmap 3057 5 127
 $CHECKZONE -D -f map -F text -o text.5 example.nil badmap >/dev/null
 [ $? = 1 ] || ret=1
 n=$((n + 1))
diff --git a/lib/dns/mapapi b/lib/dns/mapapi
index a46e1909370..cdc11d13ae1 100644
--- a/lib/dns/mapapi
+++ b/lib/dns/mapapi
@@ -13,4 +13,4 @@
 # Whenever releasing a new major release of BIND9, set this value
 # back to 1.0 when releasing the first alpha.  Map files are *never*
 # compatible across major releases.
-MAPAPI=4.0
+MAPAPI=5.0