ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

remove ' // not configured' comment when generating options.active

Browse Source
This commit is contained in:
Mark Andrews
2020-05-29 15:43:18 +10:00
parent 4b91732c09
commit 52dc7fd89d
4 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
bin/named/named.conf.rst
View File

@@ -225,15 +225,12 @@ OPTIONS
dnssec-secure-to-insecure boolean;
dnssec-update-mode ( maintain | no-resign );
dnssec-validation ( yes | no | auto );
dnstap { ( all | auth | client | forwarder |
resolver | update ) [ ( query | response ) ];
... };
dnstap-identity ( quoted_string | none |
hostname );
dnstap-output ( file | unix ) quoted_string [
size ( unlimited | size ) ] [ versions (
unlimited | integer ) ] [ suffix ( increment
| timestamp ) ];
dnstap { ( all | auth | client | forwarder | resolver | update ) [
( query | response ) ]; ... };
dnstap-identity ( quoted_string | none | hostname );
dnstap-output ( file | unix ) quoted_string [ size ( unlimited |
size ) ] [ versions ( unlimited | integer ) ] [ suffix (
increment | timestamp ) ];
dnstap-version ( quoted_string | none );
dscp integer;
dual-stack-servers [ port integer ] { ( quoted_string [ port
@@ -599,9 +596,8 @@ VIEW
dnssec-secure-to-insecure boolean;
dnssec-update-mode ( maintain | no-resign );
dnssec-validation ( yes | no | auto );
dnstap { ( all | auth | client | forwarder |
resolver | update ) [ ( query | response ) ];
... };
dnstap { ( all | auth | client | forwarder | resolver | update ) [
( query | response ) ]; ... };
dual-stack-servers [ port integer ] { ( quoted_string [ port
integer ] [ dscp integer ] | ipv4_address [ port
integer ] [ dscp integer ] | ipv6_address [ port

2
doc/misc/Makefile.am
View File

@@ -58,7 +58,7 @@ options: cfg_test
$(AM_V_CFG_TEST)$(builddir)/cfg_test --named --grammar | $(PERL) $(srcdir)/sort-options.pl | $(PERL) $(srcdir)/format-options.pl > $@
options.active: cfg_test
$(AM_V_CFG_TEST)$(builddir)/cfg_test --named --grammar --active | $(PERL) $(srcdir)/sort-options.pl | $(PERL) $(srcdir)/format-options.pl > $@
$(AM_V_CFG_TEST)$(builddir)/cfg_test --named --grammar --active | $(PERL) $(srcdir)/sort-options.pl | $(PERL) $(srcdir)/format-options.pl --strip-not-configured > $@
master.zoneopt: cfg_test
$(AM_V_CFG_TEST)$(builddir)/cfg_test --zonegrammar master --active > $@

7
doc/misc/format-options.pl
View File

@@ -9,6 +9,12 @@
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
use Getopt::Long;
my $strip_not_configured = '';
GetOptions ('strip-not-configured' => \$strip_not_configured);
print <<END;
This is a summary of the named.conf options supported by
@@ -24,6 +30,7 @@ while (<>) {
m!^( *)!;
my $indent = $1;
my $comment = "";
$line =~ s! // not configured!! if $strip_not_configured;
if ( $line =~ m!//.*! ) {
$comment = $&;
$line =~ s!//.*!!;

8
doc/misc/options.active
View File

@@ -143,8 +143,8 @@ options {
dns64-contact <string>;
dns64-server <string>;
dnskey-sig-validity <integer>;
dnsrps-enable <boolean>; // not configured
dnsrps-options { <unspecified-text> }; // not configured
dnsrps-enable <boolean>;
dnsrps-options { <unspecified-text> };
dnssec-accept-expired <boolean>;
dnssec-dnskey-kskonly <boolean>;
dnssec-loadkeys-interval <integer>;
@@ -482,8 +482,8 @@ view <string> [ <class> ] {
dns64-contact <string>;
dns64-server <string>;
dnskey-sig-validity <integer>;
dnsrps-enable <boolean>; // not configured
dnsrps-options { <unspecified-text> }; // not configured
dnsrps-enable <boolean>;
dnsrps-options { <unspecified-text> };
dnssec-accept-expired <boolean>;
dnssec-dnskey-kskonly <boolean>;
dnssec-loadkeys-interval <integer>;