From: Tinderbox User Date: Thu, 13 Mar 2014 06:24:13 +0000 (+0000) Subject: regen master X-Git-Tag: v9.10.0b2~11 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=ec899c963c91c16c393e067996400ae244921110;p=thirdparty%2Fbind9.git regen master --- diff --git a/bin/confgen/ddns-confgen.8 b/bin/confgen/ddns-confgen.8 index 5ceb80e96af..e7bbbe55b0e 100644 --- a/bin/confgen/ddns-confgen.8 +++ b/bin/confgen/ddns-confgen.8 @@ -19,11 +19,11 @@ .\" Title: ddns\-confgen .\" Author: .\" Generator: DocBook XSL Stylesheets v1.71.1 -.\" Date: September 18, 2009 +.\" Date: March 6, 2014 .\" Manual: BIND9 .\" Source: BIND9 .\" -.TH "DDNS\-CONFGEN" "8" "September 18, 2009" "BIND9" "BIND9" +.TH "DDNS\-CONFGEN" "8" "March 6, 2014" "BIND9" "BIND9" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -31,34 +31,39 @@ .SH "NAME" ddns\-confgen \- ddns key generation tool .SH "SYNOPSIS" +.HP 12 +\fBtsig\-keygen\fR [\fB\-a\ \fR\fB\fIalgorithm\fR\fR] [\fB\-h\fR] [\fB\-r\ \fR\fB\fIrandomfile\fR\fR] [name] .HP 13 -\fBddns\-confgen\fR [\fB\-a\ \fR\fB\fIalgorithm\fR\fR] [\fB\-h\fR] [\fB\-k\ \fR\fB\fIkeyname\fR\fR] [\fB\-r\ \fR\fB\fIrandomfile\fR\fR] [\-s\ \fIname\fR | \-z\ \fIzone\fR] [\fB\-q\fR] [name] +\fBddns\-confgen\fR [\fB\-a\ \fR\fB\fIalgorithm\fR\fR] [\fB\-h\fR] [\fB\-k\ \fR\fB\fIkeyname\fR\fR] [\fB\-q\fR] [\fB\-r\ \fR\fB\fIrandomfile\fR\fR] [\-s\ \fIname\fR | \-z\ \fIzone\fR] .SH "DESCRIPTION" .PP -\fBddns\-confgen\fR -generates a key for use by -\fBnsupdate\fR +\fBtsig\-keygen\fR and -\fBnamed\fR. It simplifies configuration of dynamic zones by generating a key and providing the +\fBddns\-confgen\fR +are invokation methods for a utility that generates keys for use in TSIG signing. The resulting keys can be used, for example, to secure dynamic DNS updates to a zone or for the +\fBrndc\fR +command channel. +.PP +When run as +\fBtsig\-keygen\fR, a domain name can be specified on the command line which will be used as the name of the generated key. If no name is specified, the default is +\fBtsig\-key\fR. +.PP +When run as +\fBddns\-confgen\fR, the generated key is accompanied by configuration text and instructions that can be used with \fBnsupdate\fR and -\fBnamed.conf\fR -syntax that will be needed to use it, including an example +\fBnamed\fR +when setting up dynamic DNS, including an example \fBupdate\-policy\fR -statement. -.PP -If a domain name is specified on the command line, it will be used in the name of the generated key and in the sample -\fBnamed.conf\fR -syntax. For example, -\fBddns\-confgen example.com\fR -would generate a key called "ddns\-key.example.com", and sample -\fBnamed.conf\fR -command that could be used in the zone definition for "example.com". +statement. (This usage similar to the +\fBrndc\-confgen\fR +command for setting up command channel security.) .PP Note that \fBnamed\fR itself can configure a local DDNS key for use with -\fBnsupdate \-l\fR. +\fBnsupdate \-l\fR: it does this when a zone is configured with +\fBupdate\-policy local;\fR. \fBddns\-confgen\fR is only needed when a more elaborate configuration is required: for instance, if \fBnsupdate\fR @@ -67,13 +72,12 @@ is to be used from a remote system. .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\-sha256. +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\-sha256. Options are case\-insensitive, and the "hmac\-" prefix may be omitted. .RE .PP \-h .RS 4 -Prints a short summary of the options and arguments to -\fBddns\-confgen\fR. +Prints a short summary of options and arguments. .RE .PP \-k \fIkeyname\fR @@ -93,7 +97,9 @@ The key name must have the format of a valid domain name, consisting of letters, .PP \-q .RS 4 -Quiet mode: Print only the key, with no explanatory text or usage examples. +(\fBddns\-confgen\fR +only.) Quiet mode: Print only the key, with no explanatory text or usage examples; This is essentially identical to +\fBtsig\-keygen\fR. .RE .PP \-r \fIrandomfile\fR @@ -109,7 +115,8 @@ indicates that keyboard input should be used. .PP \-s \fIname\fR .RS 4 -Single host mode: The example +(\fBddns\-confgen\fR +only.) Generate configuration example to allow dynamic updates of a single hostname. The example \fBnamed.conf\fR text shows how to set an update policy for the specified \fIname\fR @@ -120,7 +127,8 @@ option. .PP \-z \fIzone\fR .RS 4 -zone mode: The example +(\fBddns\-confgen\fR +only.) Generate configuration example to allow dynamic updates of a zone: The example \fBnamed.conf\fR text shows how to set an update policy for the specified \fIzone\fR diff --git a/bin/confgen/ddns-confgen.html b/bin/confgen/ddns-confgen.html index 78f37705a93..343daae5286 100644 --- a/bin/confgen/ddns-confgen.html +++ b/bin/confgen/ddns-confgen.html @@ -28,48 +28,59 @@

Synopsis

-

ddns-confgen [-a algorithm] [-h] [-k keyname] [-r randomfile] [ -s name | -z zone ] [-q] [name]

+

tsig-keygen [-a algorithm] [-h] [-r randomfile] [name]

+

ddns-confgen [-a algorithm] [-h] [-k keyname] [-q] [-r randomfile] [ -s name | -z zone ]

-

DESCRIPTION

-

ddns-confgen - generates a key for use by nsupdate - and named. It simplifies configuration - of dynamic zones by generating a key and providing the - nsupdate and named.conf - syntax that will be needed to use it, including an example - update-policy statement. +

DESCRIPTION

+

+ tsig-keygen and ddns-confgen + are invokation methods for a utility that generates keys for use + in TSIG signing. The resulting keys can be used, for example, + to secure dynamic DNS updates to a zone or for the + rndc command channel. +

+

+ When run as tsig-keygen, a domain name + can be specified on the command line which will be used as + the name of the generated key. If no name is specified, + the default is tsig-key.

- If a domain name is specified on the command line, it will - be used in the name of the generated key and in the sample - named.conf syntax. For example, - ddns-confgen example.com would - generate a key called "ddns-key.example.com", and sample - named.conf command that could be used - in the zone definition for "example.com". + When run as ddns-confgen, the generated + key is accompanied by configuration text and instructions + that can be used with nsupdate and + named when setting up dynamic DNS, + including an example update-policy + statement. (This usage similar to the + rndc-confgen command for setting + up command channel security.)

Note that named itself can configure a - local DDNS key for use with nsupdate -l. + local DDNS key for use with nsupdate -l: + it does this when a zone is configured with + update-policy local;. ddns-confgen is only needed when a - more elaborate configuration is required: for instance, if - nsupdate is to be used from a remote system. + more elaborate configuration is required: for instance, + if nsupdate is to be used from a remote + system.

-

OPTIONS

+

OPTIONS

-a algorithm

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-sha256. + Options are case-insensitive, and the "hmac-" prefix + may be omitted.

-h

- Prints a short summary of the options and arguments to - ddns-confgen. + Prints a short summary of options and arguments.

-k keyname

@@ -85,8 +96,9 @@

-q

- Quiet mode: Print only the key, with no explanatory text or - usage examples. + (ddns-confgen only.) Quiet mode: Print + only the key, with no explanatory text or usage examples; + This is essentially identical to tsig-keygen.

-r randomfile

@@ -102,11 +114,12 @@

-s name

- Single host mode: The example named.conf text - shows how to set an update policy for the specified - name - using the "name" nametype. - The default key name is + (ddns-confgen only.) + Generate configuration example to allow dynamic updates + of a single hostname. The example named.conf + text shows how to set an update policy for the specified + name + using the "name" nametype. The default key name is ddns-key.name. Note that the "self" nametype cannot be used, since the name to be updated may differ from the key name. @@ -114,18 +127,20 @@

-z zone

- zone mode: The example named.conf text + (ddns-confgen only.) + Generate configuration example to allow dynamic updates + of a zone: The example named.conf text shows how to set an update policy for the specified zone - using the "zonesub" nametype, allowing updates to all subdomain - names within - that zone. + using the "zonesub" nametype, allowing updates to + all subdomain names within that + zone. This option cannot be used with the -s option.

-

SEE ALSO

+

SEE ALSO

nsupdate(1), named.conf(5), named(8), @@ -133,7 +148,7 @@

-

AUTHOR

+

AUTHOR

Internet Systems Consortium

diff --git a/doc/arm/man.arpaname.html b/doc/arm/man.arpaname.html index f7ebccf23c0..a392afa8fd8 100644 --- a/doc/arm/man.arpaname.html +++ b/doc/arm/man.arpaname.html @@ -50,20 +50,20 @@

arpaname {ipaddress ...}

-

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 910be5b87ff..73e18b065b5 100644 --- a/doc/arm/man.ddns-confgen.html +++ b/doc/arm/man.ddns-confgen.html @@ -47,48 +47,59 @@

Synopsis

-

ddns-confgen [-a algorithm] [-h] [-k keyname] [-r randomfile] [ -s name | -z zone ] [-q] [name]

+

tsig-keygen [-a algorithm] [-h] [-r randomfile] [name]

+

ddns-confgen [-a algorithm] [-h] [-k keyname] [-q] [-r randomfile] [ -s name | -z zone ]

-

DESCRIPTION

-

ddns-confgen - generates a key for use by nsupdate - and named. It simplifies configuration - of dynamic zones by generating a key and providing the - nsupdate and named.conf - syntax that will be needed to use it, including an example - update-policy statement. +

DESCRIPTION

+

+ tsig-keygen and ddns-confgen + are invokation methods for a utility that generates keys for use + in TSIG signing. The resulting keys can be used, for example, + to secure dynamic DNS updates to a zone or for the + rndc command channel. +

+

+ When run as tsig-keygen, a domain name + can be specified on the command line which will be used as + the name of the generated key. If no name is specified, + the default is tsig-key.

- If a domain name is specified on the command line, it will - be used in the name of the generated key and in the sample - named.conf syntax. For example, - ddns-confgen example.com would - generate a key called "ddns-key.example.com", and sample - named.conf command that could be used - in the zone definition for "example.com". + When run as ddns-confgen, the generated + key is accompanied by configuration text and instructions + that can be used with nsupdate and + named when setting up dynamic DNS, + including an example update-policy + statement. (This usage similar to the + rndc-confgen command for setting + up command channel security.)

Note that named itself can configure a - local DDNS key for use with nsupdate -l. + local DDNS key for use with nsupdate -l: + it does this when a zone is configured with + update-policy local;. ddns-confgen is only needed when a - more elaborate configuration is required: for instance, if - nsupdate is to be used from a remote system. + more elaborate configuration is required: for instance, + if nsupdate is to be used from a remote + system.

-

OPTIONS

+

OPTIONS

-a algorithm

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-sha256. + Options are case-insensitive, and the "hmac-" prefix + may be omitted.

-h

- Prints a short summary of the options and arguments to - ddns-confgen. + Prints a short summary of options and arguments.

-k keyname

@@ -104,8 +115,9 @@

-q

- Quiet mode: Print only the key, with no explanatory text or - usage examples. + (ddns-confgen only.) Quiet mode: Print + only the key, with no explanatory text or usage examples; + This is essentially identical to tsig-keygen.

-r randomfile

@@ -121,11 +133,12 @@

-s name

- Single host mode: The example named.conf text - shows how to set an update policy for the specified - name - using the "name" nametype. - The default key name is + (ddns-confgen only.) + Generate configuration example to allow dynamic updates + of a single hostname. The example named.conf + text shows how to set an update policy for the specified + name + using the "name" nametype. The default key name is ddns-key.name. Note that the "self" nametype cannot be used, since the name to be updated may differ from the key name. @@ -133,18 +146,20 @@

-z zone

- zone mode: The example named.conf text + (ddns-confgen only.) + Generate configuration example to allow dynamic updates + of a zone: The example named.conf text shows how to set an update policy for the specified zone - using the "zonesub" nametype, allowing updates to all subdomain - names within - that zone. + using the "zonesub" nametype, allowing updates to + all subdomain names within that + zone. This option cannot be used with the -s option.

-

SEE ALSO

+

SEE ALSO

nsupdate(1), named.conf(5), named(8), @@ -152,7 +167,7 @@

-

AUTHOR

+

AUTHOR

Internet Systems Consortium

diff --git a/doc/arm/man.genrandom.html b/doc/arm/man.genrandom.html index 2a8ff0da410..ac621bf9248 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 f655752644c..92695fa8dce 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 1317e736d31..f20fdc673c2 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 @@

-

ARGUMENTS

+

ARGUMENTS

salt

@@ -80,14 +80,14 @@

-

SEE ALSO

+

SEE ALSO

BIND 9 Administrator Reference Manual, RFC 5155.

-

AUTHOR

+

AUTHOR

Internet Systems Consortium