From 45571e73747cb97c4abcdc7be8cc0c484b1b0e42 Mon Sep 17 00:00:00 2001
From: Tinderbox User
Date: Thu, 3 Nov 2016 01:12:32 +0000
Subject: [PATCH] regen v9_11
---
bin/named/named.conf.5 | 3 +
bin/named/named.conf.html | 3 +
doc/arm/Bv9ARM.ch06.html | 11 +++
doc/arm/Bv9ARM.ch09.html | 7 ++
doc/arm/man.named.conf.html | 3 +
doc/arm/notes.html | 7 ++
doc/misc/options | 143 ++++++++++++++++++++++--------------
7 files changed, 120 insertions(+), 57 deletions(-)
diff --git a/bin/named/named.conf.5 b/bin/named/named.conf.5
index 7d0a0a1dac..9f548cc63c 100644
--- a/bin/named/named.conf.5
+++ b/bin/named/named.conf.5
@@ -369,6 +369,7 @@ options {
( \fIipv4_address\fR | \fIipv6_address\fR ) [ port \fIinteger\fR ]; \&.\&.\&.
};
max\-journal\-size \fIsize_no_default\fR;
+ max\-records \fIinteger\fR;
max\-transfer\-time\-in \fIinteger\fR;
max\-transfer\-time\-out \fIinteger\fR;
max\-transfer\-idle\-in \fIinteger\fR;
@@ -556,6 +557,7 @@ view \fIstring\fR \fIoptional_class\fR {
( \fIipv4_address\fR | \fIipv6_address\fR ) [ port \fIinteger\fR ]; \&.\&.\&.
};
max\-journal\-size \fIsize_no_default\fR;
+ max\-records \fIinteger\fR;
max\-transfer\-time\-in \fIinteger\fR;
max\-transfer\-time\-out \fIinteger\fR;
max\-transfer\-idle\-in \fIinteger\fR;
@@ -650,6 +652,7 @@ zone \fIstring\fR \fIoptional_class\fR {
( \fIipv4_address\fR | \fIipv6_address\fR ) [ port \fIinteger\fR ]; \&.\&.\&.
};
max\-journal\-size \fIsize_no_default\fR;
+ max\-records \fIinteger\fR;
max\-transfer\-time\-in \fIinteger\fR;
max\-transfer\-time\-out \fIinteger\fR;
max\-transfer\-idle\-in \fIinteger\fR;
diff --git a/bin/named/named.conf.html b/bin/named/named.conf.html
index 42655e4e7a..f22501a677 100644
--- a/bin/named/named.conf.html
+++ b/bin/named/named.conf.html
@@ -320,6 +320,7 @@ options
};
max-journal-size size_no_default;
+ max-records integer;
max-transfer-time-in integer;
max-transfer-time-out integer;
max-transfer-idle-in integer;
@@ -523,6 +524,7 @@ view
};
max-journal-size size_no_default;
+ max-records integer;
max-transfer-time-in integer;
max-transfer-time-out integer;
max-transfer-idle-in integer;
@@ -623,6 +625,7 @@ zone
};
max-journal-size size_no_default;
+ max-records integer;
max-transfer-time-in integer;
max-transfer-time-out integer;
max-transfer-idle-in integer;
diff --git a/doc/arm/Bv9ARM.ch06.html b/doc/arm/Bv9ARM.ch06.html
index ad6c528023..360e82fe4e 100644
--- a/doc/arm/Bv9ARM.ch06.html
+++ b/doc/arm/Bv9ARM.ch06.html
@@ -2402,6 +2402,7 @@ badresp:1,adberr:0,findfail:0,valfail:0]
[ use-queryport-pool yes_or_no; ]
[ queryport-pool-ports number; ]
[ queryport-pool-updateinterval number; ]
+ [ max-records number; ]
[ max-transfer-time-in number; ]
[ max-transfer-time-out number; ]
[ max-transfer-idle-in number; ]
@@ -5594,6 +5595,11 @@ avoid-v6-udp-ports { 40000; range 50000 60000; };
means 2 gigabytes.
This may also be set on a per-zone basis.
+max-records
+
+ The maximum number of records permitted in a zone.
+ The default is zero which means unlimited.
+
host-statistics-max
In BIND 8, specifies the maximum number of host statistics
@@ -9171,6 +9177,11 @@ zone zone_name [max-journal-size in the section called “Server Resource Limits”.
+max-records
+
+ See the description of
+ max-records in the section called “Server Resource Limits”.
+
max-transfer-time-in
See the description of
diff --git a/doc/arm/Bv9ARM.ch09.html b/doc/arm/Bv9ARM.ch09.html
index 51e72f70c1..3f677d2bcd 100644
--- a/doc/arm/Bv9ARM.ch09.html
+++ b/doc/arm/Bv9ARM.ch09.html
@@ -108,6 +108,13 @@
+
+ Added the ability to specify the maximum number of records
+ permitted in a zone (max-records #;). This provides a mechanism
+ to block overly large zone transfers, which is a potential risk
+ with slave zones from other parties, as described in CVE-2016-6170.
+ [RT #42143]
+
It was possible to trigger a assertion when rendering a
message using a specially crafted request. This flaw is
diff --git a/doc/arm/man.named.conf.html b/doc/arm/man.named.conf.html
index 824ae9cb7f..2e6ad1023c 100644
--- a/doc/arm/man.named.conf.html
+++ b/doc/arm/man.named.conf.html
@@ -338,6 +338,7 @@ options
};
max-journal-size size_no_default;
+ max-records integer;
max-transfer-time-in integer;
max-transfer-time-out integer;
max-transfer-idle-in integer;
@@ -541,6 +542,7 @@ view
};
max-journal-size size_no_default;
+ max-records integer;
max-transfer-time-in integer;
max-transfer-time-out integer;
max-transfer-idle-in integer;
@@ -641,6 +643,7 @@ zone
};
max-journal-size size_no_default;
+ max-records integer;
max-transfer-time-in integer;
max-transfer-time-out integer;
max-transfer-idle-in integer;
diff --git a/doc/arm/notes.html b/doc/arm/notes.html
index 2639a469ad..63dfa108b4 100644
--- a/doc/arm/notes.html
+++ b/doc/arm/notes.html
@@ -69,6 +69,13 @@
+
+ Added the ability to specify the maximum number of records
+ permitted in a zone (max-records #;). This provides a mechanism
+ to block overly large zone transfers, which is a potential risk
+ with slave zones from other parties, as described in CVE-2016-6170.
+ [RT #42143]
+
It was possible to trigger a assertion when rendering a
message using a specially crafted request. This flaw is
diff --git a/doc/misc/options b/doc/misc/options
index 99fb00934a..16b1b47f0d 100644
--- a/doc/misc/options
+++ b/doc/misc/options
@@ -2,30 +2,35 @@
This is a summary of the named.conf options supported by
this version of BIND 9.
-acl { ; ... };
+acl { ; ... }; // may occur multiple times
controls {
- inet ( | | * ) [ port ( | *
- ) ] allow { ; ... } [ keys { ;
- ... } ] [ read-only ];
- unix perm owner group
- [ keys { ; ... } ] [ read-only ];
-};
+ inet ( | |
+ * ) [ port ( | * ) ] allow
+ { ; ... } [
+ keys { ; ... } ] [ read-only
+ ]; // may occur multiple times
+ unix perm
+ owner group [
+ keys { ; ... } ] [ read-only
+ ]; // may occur multiple times
+}; // may occur multiple times
dlz {
database ;
search ;
-};
+}; // may occur multiple times
-dyndb { };
+dyndb {
+ }; // may occur multiple times
key {
algorithm ;
secret ;
-};
+}; // may occur multiple times
logging {
- category { ; ... };
+ category { ; ... }; // may occur multiple times
channel {
buffered ;
file [ versions ( "unlimited" | )
@@ -37,7 +42,7 @@ logging {
severity ;
stderr;
syslog [ ];
- };
+ }; // may occur multiple times
};
lwres {
@@ -48,14 +53,15 @@ lwres {
ndots ;
search { ; ... };
view [ ];
-};
+}; // may occur multiple times
-managed-keys {
- ; ... };
+managed-keys {
+ ; ... }; // may occur multiple times
-masters [ port ] [ dscp ] { ( |
- [ port ] | [ port ] )
- [ key ]; ... };
+masters [ port ] [ dscp
+ ] { ( | [
+ port ] | [ port
+ ] ) [ key ]; ... }; // may occur multiple times
options {
acache-cleaning-interval ;
@@ -99,7 +105,8 @@ options {
check-integrity ;
check-mx ( fail | warn | ignore );
check-mx-cname ( fail | warn | ignore );
- check-names ( master | slave | response ) ( fail | warn | ignore );
+ check-names ( master | slave | response
+ ) ( fail | warn | ignore ); // may occur multiple times
check-sibling ;
check-spf ( warn | ignore );
check-srv-cname ( fail | warn | ignore );
@@ -117,9 +124,11 @@ options {
; ... } ];
dialup ( notify | notify-passive | refresh | passive | );
directory ;
- disable-algorithms { ; ... };
- disable-ds-digests { ; ... };
- disable-empty-zone ;
+ disable-algorithms { ;
+ ... }; // may occur multiple times
+ disable-ds-digests { ;
+ ... }; // may occur multiple times
+ disable-empty-zone ; // may occur multiple times
dns64 {
break-dnssec ;
clients { ; ... };
@@ -127,15 +136,16 @@ options {
mapped { ; ... };
recursive-only ;
suffix ;
- };
+ }; // may occur multiple times
dns64-contact ;
dns64-server ;
dnssec-accept-expired ;
dnssec-dnskey-kskonly ;
dnssec-enable ;
dnssec-loadkeys-interval ;
- dnssec-lookaside ( trust-anchor | auto | no );
- dnssec-must-be-secure ;
+ dnssec-lookaside ( trust-anchor
+ | auto | no ); // may occur multiple times
+ dnssec-must-be-secure ; // may occur multiple times
dnssec-secure-to-insecure ;
dnssec-update-mode ( maintain | no-resign );
dnssec-validation ( yes | no | auto );
@@ -188,10 +198,12 @@ options {
keep-response-order { ; ... };
key-directory ;
lame-ttl ;
- listen-on [ port ] [ dscp ] {
- ; ... };
- listen-on-v6 [ port ] [ dscp ] {
- ; ... };
+ listen-on [ port ] [ dscp
+ ] {
+ ; ... }; // may occur multiple times
+ listen-on-v6 [ port ] [ dscp
+ ] {
+ ; ... }; // may occur multiple times
lock-file ( | none );
maintain-ixfr-base ; // obsolete
managed-keys-directory ;
@@ -205,6 +217,7 @@ options {
max-ixfr-log-size ( unlimited | default | ); // obsolete
max-journal-size ( unlimited | );
max-ncache-ttl ;
+ max-records ;
max-recursion-depth ;
max-recursion-queries ;
max-refresh-time ;
@@ -329,7 +342,7 @@ options {
transfers-out ;
transfers-per-ns ;
treat-cr-as-space ; // obsolete
- trust-anchor-telemetry ;
+ trust-anchor-telemetry ; // experimental
try-tcp-refresh ;
update-check-ksk ;
use-alt-transfer-source ;
@@ -372,14 +385,17 @@ server {
transfer-source-v6 ( | * ) [ port ( | * )
] [ dscp ];
transfers ;
-};
+}; // may occur multiple times
statistics-channels {
- inet ( | | * ) [ port ( | *
- ) ] [ allow { ; ... } ];
-};
+ inet ( | |
+ * ) [ port ( | * ) ] [
+ allow { ; ...
+ } ]; // may occur multiple times
+}; // may occur multiple times
-trusted-keys { ; ... };
+trusted-keys {
+ ; ... }; // may occur multiple times
view [ ] {
acache-cleaning-interval ;
@@ -418,7 +434,8 @@ view [ ] {
check-integrity ;
check-mx ( fail | warn | ignore );
check-mx-cname ( fail | warn | ignore );
- check-names ( master | slave | response ) ( fail | warn | ignore );
+ check-names ( master | slave | response
+ ) ( fail | warn | ignore ); // may occur multiple times
check-sibling ;
check-spf ( warn | ignore );
check-srv-cname ( fail | warn | ignore );
@@ -430,13 +447,15 @@ view [ ] {
deny-answer-aliases { ; ... } [ except-from {
; ... } ];
dialup ( notify | notify-passive | refresh | passive | );
- disable-algorithms { ; ... };
- disable-ds-digests { ; ... };
- disable-empty-zone ;
+ disable-algorithms { ;
+ ... }; // may occur multiple times
+ disable-ds-digests { ;
+ ... }; // may occur multiple times
+ disable-empty-zone ; // may occur multiple times
dlz {
database ;
search ;
- };
+ }; // may occur multiple times
dns64 {
break-dnssec ;
clients { ; ... };
@@ -444,15 +463,16 @@ view [ ] {
mapped { ; ... };
recursive-only ;
suffix ;
- };
+ }; // may occur multiple times
dns64-contact ;
dns64-server ;
dnssec-accept-expired ;
dnssec-dnskey-kskonly ;
dnssec-enable ;
dnssec-loadkeys-interval ;
- dnssec-lookaside ( trust-anchor | auto | no );
- dnssec-must-be-secure ;
+ dnssec-lookaside ( trust-anchor
+ | auto | no ); // may occur multiple times
+ dnssec-must-be-secure ; // may occur multiple times
dnssec-secure-to-insecure ;
dnssec-update-mode ( maintain | no-resign );
dnssec-validation ( yes | no | auto );
@@ -462,7 +482,8 @@ view [ ] {
] [ dscp ] | [ port
] [ dscp ] | [ port
] [ dscp ] ); ... };
- dyndb { };
+ dyndb {
+ }; // may occur multiple times
edns-udp-size ;
empty-contact ;
empty-server ;
@@ -482,12 +503,13 @@ view [