regen master

diff --git a/bin/named/named.conf.5 b/bin/named/named.conf.5
index 18bdb7daee0a009eee256bafd1bf7f2902661aea..4f7063208899504a8d752079bf3dd0df959697c5 100644 (file)
--- a/bin/named/named.conf.5
+++ b/bin/named/named.conf.5
@@ -257,7 +257,7 @@ options {
        topology { \fIaddress_match_element\fR; \&.\&.\&. }; // not implemented
        auth\-nxdomain \fIboolean\fR; // default changed
        minimal\-any \fIboolean\fR;
-       minimal\-responses \fIboolean\fR;
+       minimal\-responses ( \fIboolean\fR | no\-auth | no\-auth\-recursive );
        recursion \fIboolean\fR;
        rrset\-order {
                [ class \fIstring\fR ] [ type \fIstring\fR ]

diff --git a/bin/named/named.conf.html b/bin/named/named.conf.html
index 55ec3f93511dc785c7e850b7fa11c71e3df9ee79..da8309a19adfb129922ff30138b6a9379cb35a54 100644 (file)
--- a/bin/named/named.conf.html
+++ b/bin/named/named.conf.html
@@ -200,7 +200,7 @@ options
        topology { <em class="replaceable"><code>address_match_element</code></em>; ... }; // not implemented<br>
        auth-nxdomain <em class="replaceable"><code>boolean</code></em>; // default changed<br>
        minimal-any <em class="replaceable"><code>boolean</code></em>;<br>
-       minimal-responses <em class="replaceable"><code>boolean</code></em>;<br>
+       minimal-responses ( <em class="replaceable"><code>boolean</code></em> | no-auth | no-auth-recursive );<br>
        recursion <em class="replaceable"><code>boolean</code></em>;<br>
        rrset-order {<br>
                [<span class="optional"> class <em class="replaceable"><code>string</code></em> </span>] [<span class="optional"> type <em class="replaceable"><code>string</code></em> </span>]<br>

diff --git a/doc/arm/Bv9ARM.ch06.html b/doc/arm/Bv9ARM.ch06.html
index c1525a395b37d0953f0192faa5a0079409c93be9..001dd5a722f7a2f36be9eb4381feb74ea7b4f48d 100644 (file)
--- a/doc/arm/Bv9ARM.ch06.html
+++ b/doc/arm/Bv9ARM.ch06.html
@@ -2309,7 +2309,7 @@ badresp:1,adberr:0,findfail:0,valfail:0]
     [<span class="optional"> host-statistics <em class="replaceable"><code>yes_or_no</code></em>; </span>]
     [<span class="optional"> host-statistics-max <em class="replaceable"><code>number</code></em>; </span>]
     [<span class="optional"> minimal-any <em class="replaceable"><code>yes_or_no</code></em>; </span>]
-    [<span class="optional"> minimal-responses <em class="replaceable"><code>yes_or_no</code></em>; </span>]
+    [<span class="optional"> minimal-responses (<em class="replaceable"><code>yes_or_no</code></em> | <code class="constant">no-auth</code> | <code class="constant">no-auth-recursive</code>); </span>]
     [<span class="optional"> multiple-cnames <em class="replaceable"><code>yes_or_no</code></em>; </span>]
     [<span class="optional"> notify <em class="replaceable"><code>yes_or_no</code></em> | <em class="replaceable"><code>explicit</code></em> | <em class="replaceable"><code>master-only</code></em>; </span>]
     [<span class="optional"> recursion <em class="replaceable"><code>yes_or_no</code></em>; </span>]
@@ -3804,14 +3804,31 @@ options {
                   6.1.3.2. The default is <strong class="userinput"><code>yes</code></strong>.
                 </p></dd>
 <dt><span class="term"><span class="command"><strong>minimal-responses</strong></span></span></dt>
-<dd><p>
-                  If <strong class="userinput"><code>yes</code></strong>, then when generating
+<dd>
+<p>
+                  If set to <strong class="userinput"><code>yes</code></strong>, then when generating
                   responses the server will only add records to the authority
                   and additional data sections when they are required (e.g.
                   delegations, negative responses).  This may improve the
                   performance of the server.
+                </p>
+<p>
+                  When set to <strong class="userinput"><code>no-auth</code></strong>, the
+                  server will omit records from the authority section
+                  unless they are required, but it may still add
+                  records to the additional section.  When set to
+                  <strong class="userinput"><code>no-auth-recursive</code></strong>, this
+                  is only done if the query is recursive.  These
+                  settings are useful when answering stub clients,
+                  which usually ignore the authority section.
+                  <strong class="userinput"><code>no-auth-recursive</code></strong> is
+                  designed for mixed-mode servers which handle
+                  both authoritative and recursive queries.
+                </p>
+<p>
                   The default is <strong class="userinput"><code>no</code></strong>.
-                </p></dd>
+                </p>
+</dd>
 <dt><span class="term"><span class="command"><strong>minimal-any</strong></span></span></dt>
 <dd><p>
                   If set to <strong class="userinput"><code>yes</code></strong>, then when

diff --git a/doc/arm/Bv9ARM.ch09.html b/doc/arm/Bv9ARM.ch09.html
index 16f05270671a1ab4a640c617a1ccabd17d72a78b..8775e5f8e95e5a08f4dd256c5d1d23c1c8b21fd4 100644 (file)
--- a/doc/arm/Bv9ARM.ch09.html
+++ b/doc/arm/Bv9ARM.ch09.html
@@ -513,7 +513,7 @@
        </p></li>
 <li class="listitem"><p>
          An <span class="command"><strong>--enable-querytrace</strong></span> configure switch is
-         now available to enable very verbose query tracelogging. This
+         now available to enable very verbose query trace logging. This
          option can only be set at compile time. This option has a
          negative performance impact and should be used only for
          debugging. [RT #37520]
@@ -757,6 +757,13 @@
          block the server.
        </p>
 </li>
+<li class="listitem"><p>
+         <span class="command"><strong>minimal-responses</strong></span> now takes two new
+         arguments: <code class="option">no-auth</code> suppresses
+         populating the authority section but not the additional
+         section; <code class="option">no-auth-recursive</code>
+         does the same but only when answering recursive queries.
+       </p></li>
 </ul></div>
 </div>
 <div class="section">

diff --git a/doc/arm/man.named.conf.html b/doc/arm/man.named.conf.html
index 4efaaa945c83e74cc6911dd4dcccb511d4b9ed9b..e6009928416d9b1fc27c2b8ef730e1050cc0f4b4 100644 (file)
--- a/doc/arm/man.named.conf.html
+++ b/doc/arm/man.named.conf.html
@@ -218,7 +218,7 @@ options
        topology { <em class="replaceable"><code>address_match_element</code></em>; ... }; // not implemented<br>
        auth-nxdomain <em class="replaceable"><code>boolean</code></em>; // default changed<br>
        minimal-any <em class="replaceable"><code>boolean</code></em>;<br>
-       minimal-responses <em class="replaceable"><code>boolean</code></em>;<br>
+       minimal-responses ( <em class="replaceable"><code>boolean</code></em> | no-auth | no-auth-recursive );<br>
        recursion <em class="replaceable"><code>boolean</code></em>;<br>
        rrset-order {<br>
                [<span class="optional"> class <em class="replaceable"><code>string</code></em> </span>] [<span class="optional"> type <em class="replaceable"><code>string</code></em> </span>]<br>

diff --git a/doc/arm/notes.html b/doc/arm/notes.html
index 1f4d5df731c2f03908d45edff8146765820de700..8b74e924806bdbfa3c3cd287a6d96b0c4994e983 100644 (file)
--- a/doc/arm/notes.html
+++ b/doc/arm/notes.html
@@ -474,7 +474,7 @@
        </p></li>
 <li class="listitem"><p>
          An <span class="command"><strong>--enable-querytrace</strong></span> configure switch is
-         now available to enable very verbose query tracelogging. This
+         now available to enable very verbose query trace logging. This
          option can only be set at compile time. This option has a
          negative performance impact and should be used only for
          debugging. [RT #37520]
@@ -718,6 +718,13 @@
          block the server.
        </p>
 </li>
+<li class="listitem"><p>
+         <span class="command"><strong>minimal-responses</strong></span> now takes two new
+         arguments: <code class="option">no-auth</code> suppresses
+         populating the authority section but not the additional
+         section; <code class="option">no-auth-recursive</code>
+         does the same but only when answering recursive queries.
+       </p></li>
 </ul></div>
 </div>
 <div class="section">

diff --git a/doc/misc/options b/doc/misc/options
index b2277b90b10b0f7adac9ec5ce9539fdcb5117d84..e4922a3e7e23ac79a138bf4da0ba14ccd6723b8f 100644 (file)
--- a/doc/misc/options
+++ b/doc/misc/options
@@ -216,7 +216,7 @@ options {
         min-retry-time <integer>;
         min-roots <integer>; // not implemented
         minimal-any <boolean>;
-        minimal-responses <boolean>;
+        minimal-responses ( no-auth | no-auth-recursive | <boolean> );
         multi-master <boolean>;
         multiple-cnames <boolean>; // obsolete
         named-xfer <quoted_string>; // obsolete
@@ -508,7 +508,7 @@ view <string> [ <class> ] {
         min-retry-time <integer>;
         min-roots <integer>; // not implemented
         minimal-any <boolean>;
-        minimal-responses <boolean>;
+        minimal-responses ( no-auth | no-auth-recursive | <boolean> );
         multi-master <boolean>;
         no-case-compress { <address_match_element>; ... };
         nocookie-udp-size <integer>;