mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-29 13:38:26 +00:00
Code Issues Releases Wiki Activity

Fix missing newlines in output of rndc nta -dump

Browse Source 
There were no newlines between each view in the list of negative trust
anchors.
This commit is contained in:
Tony Finch 2019-10-15 15:36:55 +01:00 committed by Mark Andrews
parent 01b1ae7bef
commit 61b245e318
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/named/server.c
View File

@ -15253,6 +15253,8 @@ named_server_nta(named_server_t *server, isc_lex_t *lex, bool readonly,
* If -dump was specified, list NTA's and return * If -dump was specified, list NTA's and return
*/ */
if (dump) { if (dump) {
size_t last = 0;
for (view = ISC_LIST_HEAD(server->viewlist); view != NULL; for (view = ISC_LIST_HEAD(server->viewlist); view != NULL;
view = ISC_LIST_NEXT(view, link)) view = ISC_LIST_NEXT(view, link))
{ {
@ -15264,6 +15266,12 @@ named_server_nta(named_server_t *server, isc_lex_t *lex, bool readonly,
continue; continue;
} }
if (last != isc_buffer_usedlength(*text)) {
CHECK(putstr(text, "\n"));
}
last = isc_buffer_usedlength(*text);
CHECK(dns_ntatable_totext(ntatable, view->name, text)); CHECK(dns_ntatable_totext(ntatable, view->name, text));
} }
CHECK(putnull(text)); CHECK(putnull(text));

9
bin/tests/system/rndc/tests.sh
View File

@ -817,5 +817,14 @@ grep 'include 2' dig.out.2.test$n >/dev/null || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status + ret)) status=$((status + ret))
n=$((n + 1))
echo_i "check rndc nta -dump reports NTAs in multiple views ($n)"
ret=0
$RNDCCMD 10.53.0.3 nta -dump >rndc.out.test$n 2>&1 || ret=1
lines=$(cat rndc.out.test$n | wc -l)
[ ${lines:-0} -eq 2 ] || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status + ret))
echo_i "exit status: $status" echo_i "exit status: $status"
[ $status -eq 0 ] || exit 1 [ $status -eq 0 ] || exit 1