3261. [func] RRset ordering now defaults to random. [RT #27174]

diff --git a/CHANGES b/CHANGES
index b6f430a7a9419c082c85de30e31b321d7bb2d6c0..2b38fe3b368af65b29188f01756aeff69ad2d050 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3261.  [func]          RRset ordering now defaults to random. [RT #27174]
+
 3260.  [bug]           "rrset-order cyclic" could appear not to rotate
                        for some query patterns.  [RT #27170/27185]
 

diff --git a/bin/named/config.c b/bin/named/config.c
index 93a7f1527a56c6cfa1a18a23b48fb5552f2744f1..529c3d70a3e34ece8b6e5a7fc1c97e7782faa76b 100644 (file)
--- a/bin/named/config.c
+++ b/bin/named/config.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: config.c,v 1.121 2011/08/30 23:46:51 tbox Exp $ */
+/* $Id: config.c,v 1.122 2012/01/06 19:00:12 each Exp $ */
 
 /*! \file */
 
@@ -90,7 +90,7 @@ options {\n\
 "\
        recursive-clients 1000;\n\
        resolver-query-timeout 30;\n\
-       rrset-order {type NS order random; order cyclic; };\n\
+       rrset-order { order random; };\n\
        serial-queries 20;\n\
        serial-query-rate 20;\n\
        server-id none;\n\

diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index ae4e38a740e7106d1f3b8dbed5ddcc34ccd5048f..ee8b20426686e861e909e39247ad0ff22b8da713 100644 (file)
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- File: $Id: Bv9ARM-book.xml,v 1.518 2011/11/23 18:58:39 each Exp $ -->
+<!-- File: $Id: Bv9ARM-book.xml,v 1.519 2012/01/06 19:00:13 each Exp $ -->
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <title>BIND 9 Administrator Reference Manual</title>
 
@@ -8633,8 +8633,10 @@ avoid-v6-udp-ports { 40000; range 50000 60000; };
           </para>
           <para>
             If multiple <command>rrset-order</command> statements
-            appear,
-            they are not combined &mdash; the last one applies.
+            appear, they are not combined &mdash; the last one applies.
+          </para>
+          <para>
+            By default, all records are returned in random order.
           </para>
 
           <note>