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

diff --git a/bin/named/named.conf.rst b/bin/named/named.conf.rst
index 1e54707ee7883355ffb10bc2fb9456b184647c2e..4d5e9d890108306e6025183bab61c6d3a8f7eeaa 100644 (file)
--- a/bin/named/named.conf.rst
+++ b/bin/named/named.conf.rst
@@ -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

diff --git a/doc/misc/Makefile.am b/doc/misc/Makefile.am
index 1296038cd1de1ffaaf5e2410cbcf9dfc2363e6ca..3eaace0b59d449894eaa29c358f46d191923d30f 100644 (file)
--- a/doc/misc/Makefile.am
+++ b/doc/misc/Makefile.am
@@ -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 > $@

diff --git a/doc/misc/format-options.pl b/doc/misc/format-options.pl
index 5fa3db11a03f35df5d7dac4f6474e51778cb10ae..797a014726d4e42f01daba1e00a01acf32dad0a8 100644 (file)
--- a/doc/misc/format-options.pl
+++ b/doc/misc/format-options.pl
@@ -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!//.*!!;

diff --git a/doc/misc/options.active b/doc/misc/options.active
index 8abd4e1f5d6275079011ff1125684313602c83c5..40dec8ba636c55cfddd929c367f57520132dce52 100644 (file)
--- a/doc/misc/options.active
+++ b/doc/misc/options.active
@@ -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>;