From fc3ed1dbda48d0e832ffc8ad70394cd475986531 Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org>
Date: Wed, 15 Apr 2015 09:50:07 -0700
Subject: [PATCH] [master] fix +split and +rrcomments with dig +short

4101.	[bug]		dig: the +split and +rrcomments options didn't
			work with +short. [RT #39291]
---
 CHANGES           | 3 +++
 bin/dig/dig.c     | 5 ++++-
 doc/arm/notes.xml | 6 ++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 2928f56c91..dd0e4f22de 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4101.	[bug]		dig: the +split and +rrcomments options didn't
+			work with +short. [RT #39291]
+
 4100.	[bug]		Inherited owernames on the line immediately following
 			a $INCLUDE were not working.  [RT #39268]
 
diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index df601b5708..fdb95874b2 100644
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -344,9 +344,12 @@ say_message(dns_rdata_t *rdata, dig_query_t *query, isc_buffer_t *buf) {
 		ADD_STRING(buf, " ");
 	}
 
+	if (rrcomments)
+		styleflags |= DNS_STYLEFLAG_RRCOMMENT;
 	if (nocrypto)
 		styleflags |= DNS_STYLEFLAG_NOCRYPTO;
-	result = dns_rdata_tofmttext(rdata, NULL, styleflags, 0, 60, " ", buf);
+	result = dns_rdata_tofmttext(rdata, NULL, styleflags, 0,
+				     splitwidth, " ", buf);
 	if (result == ISC_R_NOSPACE)
 		return (result);
 	check_result(result, "dns_rdata_totext");
diff --git a/doc/arm/notes.xml b/doc/arm/notes.xml
index e544456c5f..9b272c4968 100644
--- a/doc/arm/notes.xml
+++ b/doc/arm/notes.xml
@@ -587,6 +587,12 @@
 	  cause an assertion failure in mem.c. [RT #38979]
 	</para>
       </listitem>
+      <listitem>
+	<para>
+	  Some answer formatting options didn't work correctly with
+	  <command>dig +short</command>. [RT #39291]
+	</para>
+      </listitem>
     </itemizedlist>
   </sect2>
   <sect2 id="end_of_life">