70 lines
2.9 KiB
Diff
70 lines
2.9 KiB
Diff
From 8a54e87eee8ccb80f6b96c211c5d655b64feb28e Mon Sep 17 00:00:00 2001
|
|
From: Mark Andrews <marka@isc.org>
|
|
Date: Fri, 10 Apr 2026 10:24:06 +1000
|
|
Subject: [PATCH] Fix TTL extraction from A/AAAA record
|
|
|
|
(cherry picked from commit 89c86e338db2492b92e6618c586f146c6928dc6d)
|
|
(cherry picked from commit adc8285d23e2eac6ec463f5dbc5a9596fdd36c60)
|
|
|
|
Check rpz name too long wildcard CNAME expansion handling
|
|
|
|
(cherry picked from commit 9345394e2097031b55b3ef34ceaadf5a7ebbeef2)
|
|
(cherry picked from commit 095b11f20f911f5b8059bdc349b256d6c64ece30)
|
|
---
|
|
bin/tests/system/rpz/ns2/tld2.db | 2 ++
|
|
bin/tests/system/rpz/ns4/tld4.db | 2 ++
|
|
bin/tests/system/rpz/tests.sh | 7 +++++--
|
|
3 files changed, 9 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/bin/tests/system/rpz/ns2/tld2.db b/bin/tests/system/rpz/ns2/tld2.db
|
|
index c6f2556db5..c091ee27b7 100644
|
|
--- a/bin/tests/system/rpz/ns2/tld2.db
|
|
+++ b/bin/tests/system/rpz/ns2/tld2.db
|
|
@@ -123,3 +123,5 @@ a7-1 A 192.168.7.1
|
|
|
|
a7-2 A 192.168.7.2
|
|
TXT "a7-2 tld2 text"
|
|
+
|
|
+*.wild A 192.168.9.1
|
|
diff --git a/bin/tests/system/rpz/ns4/tld4.db b/bin/tests/system/rpz/ns4/tld4.db
|
|
index fca419c6dd..8accd76baf 100644
|
|
--- a/bin/tests/system/rpz/ns4/tld4.db
|
|
+++ b/bin/tests/system/rpz/ns4/tld4.db
|
|
@@ -59,6 +59,8 @@ a3-6.tld2 A 56.56.56.56
|
|
|
|
a3-7.sub1.tld2 A 57.57.57.57
|
|
|
|
+*.wild.sub1.tld2 A 57.57.57.57
|
|
+
|
|
a3-8.tld2 A 58.58.58.58
|
|
|
|
a3-9.sub9.tld2 A 59.59.59.59
|
|
diff --git a/bin/tests/system/rpz/tests.sh b/bin/tests/system/rpz/tests.sh
|
|
index 2404c9f4ba..67b6710c16 100644
|
|
--- a/bin/tests/system/rpz/tests.sh
|
|
+++ b/bin/tests/system/rpz/tests.sh
|
|
@@ -391,7 +391,7 @@ addr() {
|
|
digcmd $2 >$DIGNM
|
|
#ckalive "$2" "server crashed by 'dig $2'" || return 1
|
|
ADDR_ESC=$(echo "$ADDR" | sed -e 's/\./\\./g')
|
|
- ADDR_TTL=$(sed -n -e "s/^[-.a-z0-9]\{1,\}[ ]*\([0-9]*\) IN AA* ${ADDR_ESC}\$/\1/p" $DIGNM)
|
|
+ ADDR_TTL=$(sed -n -e "s/^[-.a-z0-9]\{1,\}[ ]*\([0-9]*\)[ ]IN[ ]AA*[ ]${ADDR_ESC}\$/\1/p" $DIGNM)
|
|
if test -z "$ADDR_TTL"; then
|
|
setret "'dig $2' wrong; no address $ADDR record in $DIGNM"
|
|
return 0
|
|
@@ -516,7 +516,10 @@ nochange TCP a3-9.tld2 # 33 tcp-only
|
|
here x.servfail <<'EOF' # 34 qname-wait-recurse yes
|
|
;; status: SERVFAIL, x
|
|
EOF
|
|
-addr 35.35.35.35 "x.servfail @$ns5" # 35 qname-wait-recurse no
|
|
+addr 35.35.35.35 "x.servfail @$ns5" # 35 qname-wait-recurse no
|
|
+here aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.wild.sub1.tld2 <<'EOF' # 36 wildcard CNAME name to long
|
|
+ ;; status: YXDOMAIN, x
|
|
+EOF
|
|
end_group
|
|
ckstats $ns3 test1 ns3 22
|
|
ckstats $ns5 test1 ns5 1
|
|
--
|
|
2.55.0
|
|
|