upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix EDNS TCP-KEEPALIVE option YAML output

Browse source 
There was missing white space between the option name and its value.

(cherry picked from commit 07c28652a3)
This commit is contained in:
Mark Andrews 2024-10-30 13:35:58 +11:00 committed by Evan Hunt
parent 246fadfef2
commit d5b9e6790f
2 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
bin/tests/system/digdelv/tests.sh
View file

@ -764,6 +764,27 @@ if [ -x "$DIG" ]; then
status=$((status + ret))
fi
n=$((n + 1))
echo_i "check that dig processes +expire ($n)"
ret=0
dig_with_opts @10.53.0.1 +expire . soa >dig.out.test$n 2>&1 || ret=1
grep '; EXPIRE: 1200 (20 minutes)' dig.out.test$n >/dev/null || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status + ret))
if [ $HAS_PYYAML -ne 0 ]; then
n=$((n + 1))
echo_i "check that dig processes +expire +yaml ($n)"
ret=0
dig_with_opts @10.53.0.1 +yaml +expire . soa >dig.out.test$n 2>&1 || ret=1
$PYTHON yamlget.py dig.out.test$n 0 message response_message_data OPT_PSEUDOSECTION EDNS EXPIRE >yamlget.out.test$n 2>&1 || ret=1
read -r value <yamlget.out.test$n
[ "$value" = "1200" ] || ret=1
grep "EXPIRE: 1200 # 20 minutes" dig.out.test$n >/dev/null || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status + ret))
fi
n=$((n + 1))
echo_i "check that Extended DNS Error 0 is printed correctly ($n)"
ret=0

2
lib/dns/message.c
View file

@ -3872,7 +3872,7 @@ dns_message_pseudosectiontoyaml(dns_message_t *msg, dns_pseudosection_t section,
if (optlen == 2) {
unsigned int dsecs;
dsecs = isc_buffer_getuint16(&optbuf);
snprintf(buf, sizeof(buf), "%u.%u",
snprintf(buf, sizeof(buf), " %u.%u",
dsecs / 10U, dsecs % 10U);
ADD_STRING(target, buf);
ADD_STRING(target, " secs\n");