From: Mark Andrews <marka@isc.org>
Date: Thu, 10 Dec 2015 01:43:50 +0000 (+1100)
Subject: 4278.   [bug]           'delv +short +[no]split[=##]' didn't work as expected.
X-Git-Tag: v9.11.0a1~266
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=505d311709be77b2bd6ebb2aead84771588f9c29;p=thirdparty%2Fbind9.git

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

diff --git a/CHANGES b/CHANGES
index a39958671f9..39c27fcd557 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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
diff --git a/bin/delv/delv.c b/bin/delv/delv.c
index ec4e89722d4..6e9c1c78e67 100644
--- a/bin/delv/delv.c
+++ b/bin/delv/delv.c
@@ -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;
diff --git a/bin/tests/system/digdelv/tests.sh b/bin/tests/system/digdelv/tests.sh
index 6dd0bb8c5ee..2b871691f7b 100644
--- a/bin/tests/system/digdelv/tests.sh
+++ b/bin/tests/system/digdelv/tests.sh
@@ -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"