mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 05:57:52 +00:00
Code Issues Releases Wiki Activity

Merge branch '4245-incorrect-return-values-in-rpz-s-addr-and-drop-function' into 'main'

Browse Source 
Resolve "Incorrect return values in rpz's addr and drop functions"

Closes #4245

See merge request isc-projects/bind9!8172
This commit is contained in:
Mark Andrews 2023-08-09 23:33:25 +00:00
commit 0aeffb55c9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bin/tests/system/rpz/tests.sh
View File

@ -355,13 +355,13 @@ ckresult () {
grep -q 'Truncated, retrying in TCP' $DIGNM && trunc=1 || trunc=0
if [ "$tcp" -ne "$trunc" ]; then
setret "'dig $digarg' wrong; no or unexpected truncation in $DIGNM"
return 1
else
clean_result ${DIGNM}*
fi
clean_result ${DIGNM}*
return 0
fi
setret "'dig $digarg' wrong; diff $DIGNM $2"
return 1
return 0
}
# check only that the server does not crash
@ -409,11 +409,11 @@ addr () {
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 1
return 0
fi
if test -n "$3" && test "$ADDR_TTL" -ne "$3"; then
setret "'dig $2' wrong; TTL=$ADDR_TTL instead of $3 in $DIGNM"
return 1
return 0
fi
clean_result ${DIGNM}*
}
@ -455,7 +455,7 @@ drop () {
return 0
fi
setret "'dig $1' wrong; response in $DIGNM"
return 1
return 0
}
nsd() {