regen master

diff --git a/bin/rndc/rndc.8 b/bin/rndc/rndc.8
index 0096d6d63ad339c59fab7c1a25b5de54a41d613a..c7bed9fe5720ce13a760b39216e361c638988641 100644 (file)
--- a/bin/rndc/rndc.8
+++ b/bin/rndc/rndc.8
@@ -210,9 +210,15 @@ and
 \fBrndc modzone\fR\&.
 .RE
 .PP
-\fBdnstap\-reopen\fR
-.RS 4
-Close and re\-open DNSTAP output files\&. This allows the files to be renamed externally then to be re\-opened\&.
+\fBdnstap ( \-reopen | \-roll \fR\fB[\fInumber\fR]\fR\fB )\fR
+.RS 4
+Close and re\-open DNSTAP output files\&.
+\fBrndc dnstap \-reopen\fR
+allows the output file to be renamed externally, then re\-opened\&.
+\fBrndc dnstap \-roll\fR
+causes the output file to be rolled automatically, similar to log files; the most recent output file has "\&.0" appended to its name; the previous most recent output file is moved to "\&.1", and so on\&. If
+\fInumber\fR
+is specified, then the number of backup log files is limited to that number\&.
 .RE
 .PP
 \fBdumpdb \fR\fB[\-all|\-cache|\-zone|\-adb|\-bad|\-fail]\fR\fB \fR\fB[\fIview \&.\&.\&.\fR]\fR

diff --git a/bin/rndc/rndc.html b/bin/rndc/rndc.html
index d9793afbbff1f2f1b38a0dcdab433ba5df2f8ce2..d3ee07ce7a0ed395aa3d60e0abd89cb68d45aaab 100644 (file)
--- a/bin/rndc/rndc.html
+++ b/bin/rndc/rndc.html
@@ -218,10 +218,17 @@
            See also <span class="command"><strong>rndc addzone</strong></span> and <span class="command"><strong>rndc modzone</strong></span>.
          </p>
 </dd>
-<dt><span class="term"><strong class="userinput"><code>dnstap-reopen</code></strong></span></dt>
+<dt><span class="term"><strong class="userinput"><code>dnstap ( -reopen | -roll [<span class="optional"><em class="replaceable"><code>number</code></em></span>] )</code></strong></span></dt>
 <dd><p>
-           Close and re-open DNSTAP output files.  This allows the files
-           to be renamed externally then to be re-opened.
+           Close and re-open DNSTAP output files.
+           <span class="command"><strong>rndc dnstap -reopen</strong></span> allows the output
+           file to be renamed externally, then re-opened.
+           <span class="command"><strong>rndc dnstap -roll</strong></span> causes the output file
+           to be rolled automatically, similar to log files; the most
+           recent output file has ".0" appended to its name; the
+           previous most recent output file is moved to ".1", and so on.
+           If <em class="replaceable"><code>number</code></em> is specified, then the
+           number of backup log files is limited to that number.
          </p></dd>
 <dt><span class="term"><strong class="userinput"><code>dumpdb [<span class="optional">-all|-cache|-zone|-adb|-bad|-fail</span>] [<span class="optional"><em class="replaceable"><code>view ...</code></em></span>]</code></strong></span></dt>
 <dd><p>
@@ -458,13 +465,13 @@
          </p></dd>
 <dt><span class="term"><strong class="userinput"><code>recursing</code></strong></span></dt>
 <dd><p>
-            Dump the list of queries <span class="command"><strong>named</strong></span> is currently
-            recursing on, and the list of domains to which iterative
-            queries are currently being sent.  (The second list includes
-            the number of fetches currently active for the given domain,
-            and how many have been passed or dropped because of the
-            <code class="option">fetches-per-zone</code> option.)
-          </p></dd>
+           Dump the list of queries <span class="command"><strong>named</strong></span> is currently
+           recursing on, and the list of domains to which iterative
+           queries are currently being sent.  (The second list includes
+           the number of fetches currently active for the given domain,
+           and how many have been passed or dropped because of the
+           <code class="option">fetches-per-zone</code> option.)
+         </p></dd>
 <dt><span class="term"><strong class="userinput"><code>refresh <em class="replaceable"><code>zone</code></em> [<span class="optional"><em class="replaceable"><code>class</code></em> [<span class="optional"><em class="replaceable"><code>view</code></em></span>]</span>]</code></strong></span></dt>
 <dd><p>
            Schedule zone maintenance for the given zone.

diff --git a/doc/arm/Bv9ARM.ch09.html b/doc/arm/Bv9ARM.ch09.html
index 266effabc528118a9564bff06d1cdddea359499c..e453a6342b616561d3c56c97bc7e376bd73edd65 100644 (file)
--- a/doc/arm/Bv9ARM.ch09.html
+++ b/doc/arm/Bv9ARM.ch09.html
@@ -117,7 +117,7 @@
 <div class="titlepage"><div><div><h3 class="title">
 <a name="relnotes_security"></a>Security Fixes</h3></div></div></div>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>
-        getrrsetbyname with a non absolute name could trigger a
+        getrrsetbyname with a non absolute name could trigger an
         infinite recursion bug in lwresd and named with lwres
         configured if when combined with a search list entry the
         resulting name is too long.  This flaw is disclosed in
@@ -238,8 +238,19 @@
          a human-readable format.
        </p>
 <p>
-         <span class="command"><strong>rndc dnstap-reopen</strong></span> can be used reopen
-         dnstap output files after renaming them.
+         <span class="command"><strong>rndc dnstap -roll</strong></span> causes <span class="command"><strong>dnstap</strong></span>
+         output files to be rolled like log files -- the most recent output
+         file is renamed with a <code class="filename">.0</code> suffix, the next
+         most recent with <code class="filename">.1</code>, etc. (Note that this
+         only works when <span class="command"><strong>dnstap</strong></span> output is being written
+         to a file, not to a UNIX domain socket.) An optional numerical
+         argument specifies how many backup log files to retain; if not
+         specified or set to 0, there is no limit.
+       </p>
+<p>
+         <span class="command"><strong>rndc dnstap -reopen</strong></span> simply closes and reopens
+         the <span class="command"><strong>dnstap</strong></span> output channel without renaming
+         the output file.
        </p>
 <p>
          For more information on <span class="command"><strong>dnstap</strong></span>, see

diff --git a/doc/arm/man.rndc.html b/doc/arm/man.rndc.html
index f3ed85282b7b94b9c533e83dd78f618ad6e49bb7..53cb4333c4410109c0f68e6f98987eee0926a40b 100644 (file)
--- a/doc/arm/man.rndc.html
+++ b/doc/arm/man.rndc.html
@@ -236,10 +236,17 @@
            See also <span class="command"><strong>rndc addzone</strong></span> and <span class="command"><strong>rndc modzone</strong></span>.
          </p>
 </dd>
-<dt><span class="term"><strong class="userinput"><code>dnstap-reopen</code></strong></span></dt>
+<dt><span class="term"><strong class="userinput"><code>dnstap ( -reopen | -roll [<span class="optional"><em class="replaceable"><code>number</code></em></span>] )</code></strong></span></dt>
 <dd><p>
-           Close and re-open DNSTAP output files.  This allows the files
-           to be renamed externally then to be re-opened.
+           Close and re-open DNSTAP output files.
+           <span class="command"><strong>rndc dnstap -reopen</strong></span> allows the output
+           file to be renamed externally, then re-opened.
+           <span class="command"><strong>rndc dnstap -roll</strong></span> causes the output file
+           to be rolled automatically, similar to log files; the most
+           recent output file has ".0" appended to its name; the
+           previous most recent output file is moved to ".1", and so on.
+           If <em class="replaceable"><code>number</code></em> is specified, then the
+           number of backup log files is limited to that number.
          </p></dd>
 <dt><span class="term"><strong class="userinput"><code>dumpdb [<span class="optional">-all|-cache|-zone|-adb|-bad|-fail</span>] [<span class="optional"><em class="replaceable"><code>view ...</code></em></span>]</code></strong></span></dt>
 <dd><p>
@@ -476,13 +483,13 @@
          </p></dd>
 <dt><span class="term"><strong class="userinput"><code>recursing</code></strong></span></dt>
 <dd><p>
-            Dump the list of queries <span class="command"><strong>named</strong></span> is currently
-            recursing on, and the list of domains to which iterative
-            queries are currently being sent.  (The second list includes
-            the number of fetches currently active for the given domain,
-            and how many have been passed or dropped because of the
-            <code class="option">fetches-per-zone</code> option.)
-          </p></dd>
+           Dump the list of queries <span class="command"><strong>named</strong></span> is currently
+           recursing on, and the list of domains to which iterative
+           queries are currently being sent.  (The second list includes
+           the number of fetches currently active for the given domain,
+           and how many have been passed or dropped because of the
+           <code class="option">fetches-per-zone</code> option.)
+         </p></dd>
 <dt><span class="term"><strong class="userinput"><code>refresh <em class="replaceable"><code>zone</code></em> [<span class="optional"><em class="replaceable"><code>class</code></em> [<span class="optional"><em class="replaceable"><code>view</code></em></span>]</span>]</code></strong></span></dt>
 <dd><p>
            Schedule zone maintenance for the given zone.

diff --git a/doc/arm/notes.html b/doc/arm/notes.html
index ab748bec0532a41a705bfd9add4849e799244b5c..5e2e42fb019b9bed466ba7779ba2167d5be94b9c 100644 (file)
--- a/doc/arm/notes.html
+++ b/doc/arm/notes.html
@@ -77,7 +77,7 @@
 <div class="titlepage"><div><div><h3 class="title">
 <a name="relnotes_security"></a>Security Fixes</h3></div></div></div>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>
-        getrrsetbyname with a non absolute name could trigger a
+        getrrsetbyname with a non absolute name could trigger an
         infinite recursion bug in lwresd and named with lwres
         configured if when combined with a search list entry the
         resulting name is too long.  This flaw is disclosed in
@@ -198,8 +198,19 @@
          a human-readable format.
        </p>
 <p>
-         <span class="command"><strong>rndc dnstap-reopen</strong></span> can be used reopen
-         dnstap output files after renaming them.
+         <span class="command"><strong>rndc dnstap -roll</strong></span> causes <span class="command"><strong>dnstap</strong></span>
+         output files to be rolled like log files -- the most recent output
+         file is renamed with a <code class="filename">.0</code> suffix, the next
+         most recent with <code class="filename">.1</code>, etc. (Note that this
+         only works when <span class="command"><strong>dnstap</strong></span> output is being written
+         to a file, not to a UNIX domain socket.) An optional numerical
+         argument specifies how many backup log files to retain; if not
+         specified or set to 0, there is no limit.
+       </p>
+<p>
+         <span class="command"><strong>rndc dnstap -reopen</strong></span> simply closes and reopens
+         the <span class="command"><strong>dnstap</strong></span> output channel without renaming
+         the output file.
        </p>
 <p>
          For more information on <span class="command"><strong>dnstap</strong></span>, see