From: Tinderbox User Date: Sun, 16 Oct 2016 01:06:28 +0000 (+0000) Subject: regen master X-Git-Tag: v9.12.0a1~721 X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=0b15ee07054a646173affaf65ddc3bd7c7953d31;p=thirdparty%2Fbind9.git regen master --- diff --git a/bin/named/named.conf.5 b/bin/named/named.conf.5 index f631e07c3a3..7d0a0a1dacf 100644 --- a/bin/named/named.conf.5 +++ b/bin/named/named.conf.5 @@ -455,6 +455,10 @@ view \fIstring\fR \fIoptional_class\fR { \fIstring\fR \fIinteger\fR \fIinteger\fR \fIinteger\fR \fIquoted_string\fR; [\&.\&.\&.] }; + managed\-keys { + \fIdomain_name\fR \fBinitial\-key\fR \fIflags\fR \fIprotocol\fR \fIalgorithm\fR \fIkey\fR; + [\&.\&.\&.] + }; allow\-recursion { \fIaddress_match_element\fR; \&.\&.\&. }; allow\-recursion\-on { \fIaddress_match_element\fR; \&.\&.\&. }; sortlist { \fIaddress_match_element\fR; \&.\&.\&. }; diff --git a/bin/named/named.conf.html b/bin/named/named.conf.html index 53aaaf1b2f5..42655e4e7aa 100644 --- a/bin/named/named.conf.html +++ b/bin/named/named.conf.html @@ -413,6 +413,11 @@ view string integer integer integer quoted_string;
[...]
};
+
+ managed-keys {
+ domain_name initial-key flags protocol algorithm key;
+ [...]
+ };

allow-recursion { address_match_element; ... };
allow-recursion-on { address_match_element; ... };
diff --git a/doc/arm/man.named.conf.html b/doc/arm/man.named.conf.html index 09cdaacad28..824ae9cb7fb 100644 --- a/doc/arm/man.named.conf.html +++ b/doc/arm/man.named.conf.html @@ -431,6 +431,11 @@ view string integer integer integer quoted_string;
[...]
};
+
+ managed-keys {
+ domain_name initial-key flags protocol algorithm key;
+ [...]
+ };

allow-recursion { address_match_element; ... };
allow-recursion-on { address_match_element; ... };