mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 06:55:30 +00:00
Code Issues Releases Wiki Activity

Merge branch '3003-greedy-regular-expression-causes-intermittent-nsupdate-system-test-failures' into 'main'

Browse Source 
Resolve "Greedy regular expression causes intermittent "nsupdate" system test failures"

Closes #3003

See merge request isc-projects/bind9!5559
This commit is contained in:
Mark Andrews
2021-11-10 01:49:43 +00:00
parent ed99c502b6 c1df7884f0
commit e8d1dd30bc
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@@ -1,3 +1,7 @@
5757. [test] Replace sed in nsupdate system test with awk to
construct the nsupdate command. The sed expression
was not reliably changing the ttl. [GL #3003]
5756. [func] Assign HTTP freshness lifetime to responses sent 5756. [func] Assign HTTP freshness lifetime to responses sent
via DNS-over-HTTPS, according to the recommendations via DNS-over-HTTPS, according to the recommendations
given in RFC 8484. [GL #2854] given in RFC 8484. [GL #2854]

1
bin/tests/system/nsupdate/clean.sh
View File

@@ -63,4 +63,5 @@ rm -f perl.update_test.out
rm -f nsupdate.out* rm -f nsupdate.out*
rm -f typelist.out.* rm -f typelist.out.*
rm -f update.out.* rm -f update.out.*
rm -f update.in.*
rm -f verylarge rm -f verylarge

7
bin/tests/system/nsupdate/tests.sh
View File

@@ -750,9 +750,10 @@ ret=0
echo_i "check that changes to the DNSKEY RRset TTL do not have side effects ($n)" echo_i "check that changes to the DNSKEY RRset TTL do not have side effects ($n)"
$DIG $DIGOPTS +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd dnskey.test. \ $DIG $DIGOPTS +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd dnskey.test. \
@10.53.0.3 dnskey | \ @10.53.0.3 dnskey | \
sed -n 's/\(.*\)10.IN/update add \1600 IN/p' | awk -v port="${PORT}" 'BEGIN { print "server 10.53.0.3", port; }
(echo server 10.53.0.3 ${PORT}; cat - ; echo send ) | $2 == 10 && $3 == "IN" && $4 == "DNSKEY" { $2 = 600; print "update add", $0 }
$NSUPDATE END { print "send" }' > update.in.$n
$NSUPDATE update.in.$n
$DIG $DIGOPTS +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd dnskey.test. \ $DIG $DIGOPTS +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd dnskey.test. \
@10.53.0.3 any > dig.out.ns3.$n @10.53.0.3 any > dig.out.ns3.$n