[master] fix +split and +rrcomments with dig +short

4101.	[bug]		dig: the +split and +rrcomments options didn't
			work with +short. [RT #39291]

diff --git a/CHANGES b/CHANGES
index 2928f56c91caedeb77925b4604353f9ee00575ea..dd0e4f22de1d27478dc1de3f1d65423b57705206 100644 (file)
--- 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 df601b570851c467be2e79dd25a91b1a5574896b..fdb95874b2d00c7305004682acf1e329b3a1a0a4 100644 (file)
--- 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 e544456c5f09e044b58446be44acae77a97526bc..9b272c49683a879315a6f4806eea3867e90ee71d 100644 (file)
--- 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">