regen v9_11

2016-08-19 01:08:24 +00:00
parent 77997fab4b
commit 281ed127e3
17 changed files with 145 additions and 26 deletions
--- a/bin/confgen/rndc-confgen.8
+++ b/bin/confgen/rndc-confgen.8
@@ -111,7 +111,7 @@ as directed\&.
 .PP
 \-A \fIalgorithm\fR
 .RS 4
-Specifies the algorithm to use for the TSIG key\&. Available choices are: hmac\-md5, hmac\-sha1, hmac\-sha224, hmac\-sha256, hmac\-sha384 and hmac\-sha512\&. The default is hmac\-md5\&.
+Specifies the algorithm to use for the TSIG key\&. Available choices are: hmac\-md5, hmac\-sha1, hmac\-sha224, hmac\-sha256, hmac\-sha384 and hmac\-sha512\&. The default is hmac\-md5 or if MD5 was disabled hmac\-sha256\&.
 .RE
 .PP
 \-b \fIkeysize\fR
--- a/bin/confgen/rndc-confgen.html
+++ b/bin/confgen/rndc-confgen.html
@@ -81,7 +81,8 @@
 <dd><p>
            Specifies the algorithm to use for the TSIG key.  Available
            choices are: hmac-md5, hmac-sha1, hmac-sha224, hmac-sha256,
-            hmac-sha384 and hmac-sha512.  The default is hmac-md5.
+            hmac-sha384 and hmac-sha512.  The default is hmac-md5 or
+            if MD5 was disabled hmac-sha256.
          </p></dd>
 <dt><span class="term">-b <em class="replaceable"><code>keysize</code></em></span></dt>
 <dd><p>
--- a/bin/dig/dig.1
+++ b/bin/dig/dig.1
@@ -261,7 +261,9 @@ hmac\-sha384, or
 hmac\-sha512\&. If
 \fIhmac\fR
 is not specified, the default is
-hmac\-md5\&.
+hmac\-md5
+or if MD5 was disabled
+hmac\-sha256\&.
 .sp
 NOTE: You should use the
 \fB\-k\fR
--- a/bin/dig/dig.html
+++ b/bin/dig/dig.html
@@ -237,7 +237,8 @@
 	    <code class="literal">hmac-sha1</code>, <code class="literal">hmac-sha224</code>,
 	    <code class="literal">hmac-sha256</code>, <code class="literal">hmac-sha384</code>, or
 	    <code class="literal">hmac-sha512</code>.  If <em class="parameter"><code>hmac</code></em>
-	    is not specified, the default is <code class="literal">hmac-md5</code>.
+	    is not specified, the default is <code class="literal">hmac-md5</code>
+	    or if MD5 was disabled <code class="literal">hmac-sha256</code>.
 	  </p>
 <p>
 	    NOTE: You should use the <code class="option">-k</code> option and
--- a/bin/named/named.conf.5
+++ b/bin/named/named.conf.5
@@ -216,8 +216,19 @@ options {
 	coresize \fIsize\fR;
 	datasize \fIsize\fR;
 	directory \fIquoted_string\fR;
+	dnstap { \fImessage_type\fR; \&.\&.\&. };
+	dnstap\-output ( file | unix ) \fIpath_name\fR;
+	dnstap\-identity ( \fIstring\fR | hostname | none );
+	dnstap\-version ( \fIstring\fR | none );
 	dump\-file \fIquoted_string\fR;
 	files \fIsize\fR;
+	fstrm\-set\-buffer\-hint \fInumber\fR;
+	fstrm\-set\-flush\-timeout \fInumber\fR;
+	fstrm\-set\-input\-queue\-size \fInumber\fR;
+	fstrm\-set\-output\-notify\-threshold \fInumber\fR;
+	fstrm\-set\-output\-queue\-model ( \fImpsc\fR | \fIspsc\fR ) ;
+	fstrm\-set\-output\-queue\-size \fInumber\fR;
+	fstrm\-set\-reopen\-interval \fInumber\fR;
 	heartbeat\-interval \fIinteger\fR;
 	host\-statistics \fIboolean\fR; // not implemented
 	host\-statistics\-max \fInumber\fR; // not implemented
--- a/bin/named/named.conf.html
+++ b/bin/named/named.conf.html
@@ -159,8 +159,19 @@ options
 	coresize <em class="replaceable"><code>size</code></em>;<br>
 	datasize <em class="replaceable"><code>size</code></em>;<br>
 	directory <em class="replaceable"><code>quoted_string</code></em>;<br>
+	dnstap { <em class="replaceable"><code>message_type</code></em>; ... };<br>
+	dnstap-output ( <code class="literal">file</code> | <code class="literal">unix</code> ) <em class="replaceable"><code>path_name</code></em>;<br>
+	dnstap-identity ( <em class="replaceable"><code>string</code></em> | <code class="literal">hostname</code> | <code class="literal">none</code> );<br>
+	dnstap-version ( <em class="replaceable"><code>string</code></em> | <code class="literal">none</code> );<br>
 	dump-file <em class="replaceable"><code>quoted_string</code></em>;<br>
 	files <em class="replaceable"><code>size</code></em>;<br>
+	fstrm-set-buffer-hint <em class="replaceable"><code>number</code></em>;<br>
+	fstrm-set-flush-timeout <em class="replaceable"><code>number</code></em>;<br>
+	fstrm-set-input-queue-size <em class="replaceable"><code>number</code></em>;<br>
+	fstrm-set-output-notify-threshold <em class="replaceable"><code>number</code></em>;<br>
+	fstrm-set-output-queue-model ( <em class="replaceable"><code>mpsc</code></em> | <em class="replaceable"><code>spsc</code></em> ) ;<br>
+	fstrm-set-output-queue-size <em class="replaceable"><code>number</code></em>;<br>
+	fstrm-set-reopen-interval <em class="replaceable"><code>number</code></em>;<br>
 	heartbeat-interval <em class="replaceable"><code>integer</code></em>;<br>
 	host-statistics <em class="replaceable"><code>boolean</code></em>; // not implemented<br>
 	host-statistics-max <em class="replaceable"><code>number</code></em>; // not implemented<br>
--- a/bin/nsupdate/nsupdate.1
+++ b/bin/nsupdate/nsupdate.1
@@ -209,7 +209,9 @@ hmac\-sha384, or
 hmac\-sha512\&. If
 \fIhmac\fR
 is not specified, the default is
-hmac\-md5\&.
+hmac\-md5
+or if MD5 was disabled
+hmac\-sha256\&.
 .sp
 NOTE: Use of the
 \fB\-y\fR
@@ -284,7 +286,9 @@ Specifies that all updates are to be TSIG\-signed using the
 pair\&. If
 \fIhmac\fR
 is specified, then it sets the signing algorithm in use; the default is
-hmac\-md5\&. The
+hmac\-md5
+or if MD5 was disabled
+hmac\-sha256\&. The
 \fBkey\fR
 command overrides any key specified on the command line via
 \fB\-y\fR
--- a/bin/nsupdate/nsupdate.html
+++ b/bin/nsupdate/nsupdate.html
@@ -201,7 +201,8 @@
 	    <code class="literal">hmac-sha1</code>, <code class="literal">hmac-sha224</code>,
 	    <code class="literal">hmac-sha256</code>, <code class="literal">hmac-sha384</code>, or
 	    <code class="literal">hmac-sha512</code>.  If <em class="parameter"><code>hmac</code></em>
-	    is not specified, the default is <code class="literal">hmac-md5</code>.
+	    is not specified, the default is <code class="literal">hmac-md5</code>
+	    or if MD5 was disabled <code class="literal">hmac-sha256</code>.
 	  </p>
 <p>
 	    NOTE: Use of the <code class="option">-y</code> option is discouraged because the
@@ -326,7 +327,8 @@
 	      <em class="parameter"><code>keyname</code></em> <em class="parameter"><code>secret</code></em> pair.
 	      If <em class="parameter"><code>hmac</code></em> is specified, then it sets the
 	      signing algorithm in use; the default is
-	      <code class="literal">hmac-md5</code>.  The <span class="command"><strong>key</strong></span>
+	      <code class="literal">hmac-md5</code> or if MD5 was disabled
+	      <code class="literal">hmac-sha256</code>.  The <span class="command"><strong>key</strong></span>
 	      command overrides any key specified on the command line via
 	      <code class="option">-y</code> or <code class="option">-k</code>.
 	    </p></dd>
--- a/bin/pkcs11/pkcs11-tokens.8
+++ b/bin/pkcs11/pkcs11-tokens.8
@@ -51,7 +51,7 @@ lists the PKCS#11 available tokens with defaults from the slot/token scan perfor
 Specify the PKCS#11 provider module\&. This must be the full path to a shared library object implementing the PKCS#11 API for the device\&.
 .RE
 .PP
-\-e
+\-v
 .RS 4
 Make the PKCS#11 libisc initialization verbose\&.
 .RE
--- a/bin/pkcs11/pkcs11-tokens.html
+++ b/bin/pkcs11/pkcs11-tokens.html
@@ -1,17 +1,9 @@
 <!--
 - Copyright (C) 2014-2016 Internet Systems Consortium, Inc. ("ISC")
 - 
- - Permission to use, copy, modify, and/or distribute this software for any
- - purpose with or without fee is hereby granted, provided that the above
- - copyright notice and this permission notice appear in all copies.
- - 
- - THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- - REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- - AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- - INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- - LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- - PERFORMANCE OF THIS SOFTWARE.
+ - This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 <html>
 <head>
@@ -46,7 +38,7 @@
            path to a shared library object implementing the PKCS#11 API
            for the device.
          </p></dd>
-<dt><span class="term">-e</span></dt>
+<dt><span class="term">-v</span></dt>
 <dd><p>
            Make the PKCS#11 libisc initialization verbose.
          </p></dd>