4201. [func] The default preferred-glue is now the address record

                        type of the transport the query was received
                        over.  [RT #40468]

diff --git a/CHANGES b/CHANGES
index 11d0507a0c3811ba250203cd9ebbedbc5cde0260..882c4ac255c7d65307fb159ea4e50db6a017b532 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+4201.  [func]          The default preferred-glue is now the address record
+                       type of the transport the query was received
+                       over.  [RT #40468]
+
 4200.  [cleanup]       win32: update BINDinstall to be BIND release
                        independent. [RT #38915]
 

diff --git a/bin/named/client.c b/bin/named/client.c
index 64c6180b2108e602baf992c47708f3437d1def0a..e5c26895cc25a6d03f8994ea00ecc305cdf9e5d9 100644 (file)
--- a/bin/named/client.c
+++ b/bin/named/client.c
@@ -1005,6 +1005,12 @@ client_send(ns_client_t *client) {
                else if (client->view->preferred_glue == dns_rdatatype_aaaa)
                        preferred_glue = DNS_MESSAGERENDER_PREFER_AAAA;
        }
+       if (preferred_glue == 0) {
+               if (isc_sockaddr_pf(&client->peeraddr) == AF_INET)
+                       preferred_glue = DNS_MESSAGERENDER_PREFER_A;
+               else
+                       preferred_glue = DNS_MESSAGERENDER_PREFER_AAAA;
+       }
 
 #ifdef ALLOW_FILTER_AAAA
        /*

diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 9686827f35ab090753392f86bd7105e4226b97d2..574fadc1da14952387538d30f009e96bbd12b263 100644 (file)
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -5538,7 +5538,9 @@ badresp:1,adberr:0,findfail:0,valfail:0]
                If specified, the listed type (A or AAAA) will be emitted
                before other glue
                in the additional section of a query response.
-               The default is not to prefer any type (NONE).
+               The default is to prefer A records when responding
+               to queries that arrived via IPv4 and AAAA when
+               responding to queries that arrived via IPv6.
              </para>
            </listitem>
          </varlistentry>

diff --git a/doc/arm/notes.xml b/doc/arm/notes.xml
index 0718a4c353b5c1d73522e6c3febad7b1796d2500..c8c21606f76663d0f0570e4c2eb4f461f54256b8 100644 (file)
--- a/doc/arm/notes.xml
+++ b/doc/arm/notes.xml
@@ -610,6 +610,12 @@
          using the <option>log</option> clause.
        </para>
       </listitem>
+      <listitem>
+       <para>
+         The default preferred glue is now the address type of the
+          transport the query was received over.
+       </para>
+      </listitem>
     </itemizedlist>
   </sect2>
   <sect2 id="relnotes_port">