From: Tinderbox User
Date: Wed, 12 Mar 2014 01:05:39 +0000 (+0000)
Subject: regen master
X-Git-Tag: v9.10.0b2~27
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=3c7b4ac4517ac9d78c9bf3e0e790cedce10ddc18;p=thirdparty%2Fbind9.git
regen master
---
diff --git a/bin/rndc/rndc.8 b/bin/rndc/rndc.8
index 8afb23c2af7..2b0a7f6cbaa 100644
--- a/bin/rndc/rndc.8
+++ b/bin/rndc/rndc.8
@@ -414,7 +414,10 @@ or
\fBiterations\fR
defines the number of additional times to apply the algorithm when generating an NSEC3 hash. The
\fBsalt\fR
-is a string of data expressed in hexadecimal, or a hyphen (`\-') if no salt is to be used.
+is a string of data expressed in hexadecimal, a hyphen (`\-') if no salt is to be used, or the keyword
+auto, which causes
+\fBnamed\fR
+to generate a random 64\-bit salt.
.sp
So, for example, to create an NSEC3 chain using the SHA\-1 hash algorithm, no opt\-out flag, 10 iterations, and a salt value of "FFFF", use:
\fBrndc signing \-nsec3param 1 0 10 FFFF \fR\fB\fIzone\fR\fR. To set the opt\-out flag, 15 iterations, and no salt, use:
diff --git a/bin/rndc/rndc.html b/bin/rndc/rndc.html
index 56f06a2e80f..0461d862c8c 100644
--- a/bin/rndc/rndc.html
+++ b/bin/rndc/rndc.html
@@ -496,8 +496,10 @@
defines the number of additional times to apply
the algorithm when generating an NSEC3 hash. The
salt is a string of data expressed
- in hexadecimal, or a hyphen (`-') if no salt is
- to be used.
+ in hexadecimal, a hyphen (`-') if no salt is
+ to be used, or the keyword auto,
+ which causes named to generate a
+ random 64-bit salt.
So, for example, to create an NSEC3 chain using
@@ -517,7 +519,7 @@
-
LIMITATIONS
+
LIMITATIONS
There is currently no way to provide the shared secret for a
key_id without using the configuration file.
@@ -527,7 +529,7 @@
-
SEE ALSO
+
SEE ALSO
rndc.conf(5),
rndc-confgen(8),
named(8),
@@ -537,7 +539,7 @@
-
AUTHOR
+
AUTHOR
Internet Systems Consortium
diff --git a/doc/arm/man.arpaname.html b/doc/arm/man.arpaname.html
index f06f8bbe369..f7ebccf23c0 100644
--- a/doc/arm/man.arpaname.html
+++ b/doc/arm/man.arpaname.html
@@ -50,20 +50,20 @@
-
DESCRIPTION
+
DESCRIPTION
arpaname translates IP addresses (IPv4 and
IPv6) to the corresponding IN-ADDR.ARPA or IP6.ARPA names.
-
SEE ALSO
+
SEE ALSO
BIND 9 Administrator Reference Manual.
-
AUTHOR
+
AUTHOR
Internet Systems Consortium
diff --git a/doc/arm/man.ddns-confgen.html b/doc/arm/man.ddns-confgen.html
index 861d8eb2fa2..910be5b87ff 100644
--- a/doc/arm/man.ddns-confgen.html
+++ b/doc/arm/man.ddns-confgen.html
@@ -50,7 +50,7 @@
ddns-confgen [-a algorithm] [-h] [-k keyname] [-r randomfile] [ -s name | -z zone ] [-q] [name]
-
DESCRIPTION
+
DESCRIPTION
ddns-confgen
generates a key for use by nsupdate
and named. It simplifies configuration
@@ -77,7 +77,7 @@
-
OPTIONS
+
OPTIONS
- -a
algorithm
@@ -144,7 +144,7 @@
-
SEE ALSO
+
SEE ALSO
nsupdate(1),
named.conf(5),
named(8),
@@ -152,7 +152,7 @@
-
AUTHOR
+
AUTHOR
Internet Systems Consortium
diff --git a/doc/arm/man.genrandom.html b/doc/arm/man.genrandom.html
index 5cc050a8d3c..2a8ff0da410 100644
--- a/doc/arm/man.genrandom.html
+++ b/doc/arm/man.genrandom.html
@@ -50,7 +50,7 @@
genrandom [-n number] {size} {filename}
-
DESCRIPTION
+
DESCRIPTION
genrandom
generates a file or a set of files containing a specified quantity
@@ -59,7 +59,7 @@
-
ARGUMENTS
+
ARGUMENTS
- -n
number
@@ -77,14 +77,14 @@
-
SEE ALSO
+
SEE ALSO
rand(3),
arc4random(3)
-
AUTHOR
+
AUTHOR
Internet Systems Consortium
diff --git a/doc/arm/man.isc-hmac-fixup.html b/doc/arm/man.isc-hmac-fixup.html
index 93782392e65..f655752644c 100644
--- a/doc/arm/man.isc-hmac-fixup.html
+++ b/doc/arm/man.isc-hmac-fixup.html
@@ -50,7 +50,7 @@
isc-hmac-fixup {algorithm} {secret}
-
DESCRIPTION
+
DESCRIPTION
Versions of BIND 9 up to and including BIND 9.6 had a bug causing
HMAC-SHA* TSIG keys which were longer than the digest length of the
@@ -76,7 +76,7 @@
-
SECURITY CONSIDERATIONS
+
SECURITY CONSIDERATIONS
Secrets that have been converted by isc-hmac-fixup
are shortened, but as this is how the HMAC protocol works in
@@ -87,14 +87,14 @@
-
SEE ALSO
+
SEE ALSO
BIND 9 Administrator Reference Manual,
RFC 2104.
-
AUTHOR
+
AUTHOR
Internet Systems Consortium
diff --git a/doc/arm/man.nsec3hash.html b/doc/arm/man.nsec3hash.html
index f8d91cff6be..1317e736d31 100644
--- a/doc/arm/man.nsec3hash.html
+++ b/doc/arm/man.nsec3hash.html
@@ -48,7 +48,7 @@
nsec3hash {salt} {algorithm} {iterations} {domain}
-
DESCRIPTION
+
DESCRIPTION
nsec3hash generates an NSEC3 hash based on
a set of NSEC3 parameters. This can be used to check the validity
@@ -56,7 +56,7 @@
-
SEE ALSO
+
SEE ALSO
BIND 9 Administrator Reference Manual,
RFC 5155.
-
AUTHOR
+
AUTHOR
Internet Systems Consortium
diff --git a/doc/arm/man.rndc-confgen.html b/doc/arm/man.rndc-confgen.html
index 28fa2f27923..261eb3b8501 100644
--- a/doc/arm/man.rndc-confgen.html
+++ b/doc/arm/man.rndc-confgen.html
@@ -50,7 +50,7 @@
rndc-confgen [-a] [-A algorithm] [-b keysize] [-c keyfile] [-h] [-k keyname] [-p port] [-r randomfile] [-s address] [-t chrootdir] [-u user]
-
DESCRIPTION
+
DESCRIPTION
rndc-confgen
generates configuration files
for rndc. It can be used as a
@@ -66,7 +66,7 @@
-
EXAMPLES
+
EXAMPLES
To allow rndc to be used with
no manual configuration, run
@@ -197,7 +197,7 @@
-
SEE ALSO
+
SEE ALSO
rndc(8),
rndc.conf(5),
named(8),
@@ -205,7 +205,7 @@
-
AUTHOR
+
AUTHOR
Internet Systems Consortium
diff --git a/doc/arm/man.rndc.conf.html b/doc/arm/man.rndc.conf.html
index 8e5ebe021a4..94ba9d18568 100644
--- a/doc/arm/man.rndc.conf.html
+++ b/doc/arm/man.rndc.conf.html
@@ -50,7 +50,7 @@
-
DESCRIPTION
+
DESCRIPTION
rndc.conf is the configuration file
for rndc, the BIND 9 name server control
utility. This file has a similar structure and syntax to
@@ -136,7 +136,7 @@
-
EXAMPLE
+
EXAMPLE
options {
default-server localhost;
@@ -210,7 +210,7 @@
-
NAME SERVER CONFIGURATION
+
NAME SERVER CONFIGURATION
The name server must be configured to accept rndc connections and
to recognize the key specified in the rndc.conf
@@ -220,7 +220,7 @@
-
SEE ALSO
+
SEE ALSO
rndc(8),
rndc-confgen(8),
mmencode(1),
@@ -228,7 +228,7 @@
-
AUTHOR
+
AUTHOR
Internet Systems Consortium
diff --git a/doc/arm/man.rndc.html b/doc/arm/man.rndc.html
index 1a29265e18f..0e8247a164f 100644
--- a/doc/arm/man.rndc.html
+++ b/doc/arm/man.rndc.html
@@ -50,7 +50,7 @@
rndc [-b source-address] [-c config-file] [-k key-file] [-s server] [-p port] [-q] [-V] [-y key_id] {command}
-
DESCRIPTION
+
DESCRIPTION
rndc
controls the operation of a name
server. It supersedes the ndc utility
@@ -81,7 +81,7 @@
-
OPTIONS
+
OPTIONS
- -b
source-address
@@ -152,7 +152,7 @@
-
COMMANDS
+
COMMANDS
A list of commands supported by rndc can
be seen by running rndc without arguments.
@@ -514,8 +514,10 @@
defines the number of additional times to apply
the algorithm when generating an NSEC3 hash. The
salt is a string of data expressed
- in hexadecimal, or a hyphen (`-') if no salt is
- to be used.
+ in hexadecimal, a hyphen (`-') if no salt is
+ to be used, or the keyword auto,
+ which causes named to generate a
+ random 64-bit salt.
So, for example, to create an NSEC3 chain using
@@ -535,7 +537,7 @@
-
LIMITATIONS
+
LIMITATIONS
There is currently no way to provide the shared secret for a
key_id without using the configuration file.
@@ -545,7 +547,7 @@
-
SEE ALSO
+
SEE ALSO
rndc.conf(5),
rndc-confgen(8),
named(8),
@@ -555,7 +557,7 @@
-
AUTHOR
+
AUTHOR
Internet Systems Consortium