ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

4278. [bug] 'delv +short +[no]split[=##]' didn't work as expected.

Browse Source 
[RT #41238]
This commit is contained in:
Mark Andrews
2015-12-10 12:43:50 +11:00
parent 6fe5cc5aea
commit 505d311709
3 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,3 +1,6 @@
4278. [bug] 'delv +short +[no]split[=##]' didn't work as expected.
[RT #41238]
4277. [performance] Improve performance of the RBT, the central zone
datastructure: The aux hashtable was improved,
hash function was updated to perform more

4
bin/delv/delv.c
View File

@@ -454,8 +454,8 @@ printdata(dns_rdataset_t *rdataset, dns_name_t *owner,
dns_rdataset_current(rdataset, &rdata);
result = dns_rdata_tofmttext(&rdata,
dns_rootname,
styleflags,
0, 60, " ",
styleflags, 0,
splitwidth, " ",
&target);
if (result != ISC_R_SUCCESS)
break;

24
bin/tests/system/digdelv/tests.sh
View File

@@ -247,13 +247,35 @@ if [ -x ${DELV} ] ; then
status=`expr $status + $ret`
n=`expr $n + 1`
echo "I:checking delv +short +rrcomments works($n)"
echo "I:checking delv +short +rrcomments works ($n)"
ret=0
$DELV $DELVOPTS +tcp @10.53.0.3 +short +rrcomments DNSKEY dnskey.example > delv.out.test$n || ret=1
grep "S8M= ; ZSK; alg = RSAMD5 ; key id = 30795$" < delv.out.test$n > /dev/null || ret=1
if [ $ret != 0 ]; then echo "I:failed"; fi
status=`expr $status + $ret`
n=`expr $n + 1`
echo "I:checking delv +short +nosplit works ($n)"
ret=0
$DELV $DELVOPTS +tcp @10.53.0.3 +short +nosplit DNSKEY dnskey.example > delv.out.test$n || ret=1
grep "Z8plc4Rb9VIE5x7KNHAYTvTO5d4S8M=" < delv.out.test$n > /dev/null || ret=1
if test `wc -l < delv.out.test$n` != 1 ; then ret=1 ; fi
f=`awk '{print NF}' < delv.out.test$n`
test "${f:-0}" -eq 14 || ret=1
if [ $ret != 0 ]; then echo "I:failed"; fi
status=`expr $status + $ret`
n=`expr $n + 1`
echo "I:checking delv +short +nosplit +norrcomments works ($n)"
ret=0
$DELV $DELVOPTS +tcp @10.53.0.3 +short +nosplit +norrcomments DNSKEY dnskey.example > delv.out.test$n || ret=1
grep "Z8plc4Rb9VIE5x7KNHAYTvTO5d4S8M=$" < delv.out.test$n > /dev/null || ret=1
if test `wc -l < delv.out.test$n` != 1 ; then ret=1 ; fi
f=`awk '{print NF}' < delv.out.test$n`
test "${f:-0}" -eq 4 || ret=1
if [ $ret != 0 ]; then echo "I:failed"; fi
status=`expr $status + $ret`
exit $status
else
echo "$DELV is needed, so skipping these delv tests"