From 920352629bbd3cf3d06c943a9403f0aacfda5aff Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Mon, 5 Dec 2016 10:02:13 -0800 Subject: [PATCH] [v9_10] fix backporting error --- doc/arm/Bv9ARM-book.xml | 226 ---------------------------------------- 1 file changed, 226 deletions(-) diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml index fcb90c5476..b79fa09977 100644 --- a/doc/arm/Bv9ARM-book.xml +++ b/doc/arm/Bv9ARM-book.xml @@ -10182,33 +10182,6 @@ example.com CNAME rpz-tcp-only.
<command>server</command> Statement Grammar -<<<<<<< HEAD -server ip_addr[/prefixlen] { - bogus yes_or_no ; - provide-ixfr yes_or_no ; - request-ixfr yes_or_no ; - request-nsid yes_or_no ; - request-sit yes_or_no ; - edns yes_or_no ; - edns-udp-size number ; - max-udp-size number ; - tcp-only yes_or_no ; - transfers number ; - transfer-format ( one-answer | many-answers ) ; ] - keys { key_id }; - transfer-source (ip4_addr | *) port ip_port dscp ip_dscp ; - transfer-source-v6 (ip6_addr | *) port ip_port dscp ip_dscp ; - notify-source (ip4_addr | *) port ip_port dscp ip_dscp ; - notify-source-v6 (ip6_addr | *) port ip_port dscp ip_dscp ; - query-source address ( ip_addr | * ) - port ( ip_port | * ) dscp ip_dscp ; - query-source-v6 address ( ip_addr | * ) - port ( ip_port | * ) dscp ip_dscp ; - use-queryport-pool yes_or_no; - queryport-pool-ports number; - queryport-pool-updateinterval number; -}; -======= server ( ip_addr | ip_prefix ) { [ bogus yes_or_no ; ] [ provide-ixfr yes_or_no ; ] @@ -10238,7 +10211,6 @@ example.com CNAME rpz-tcp-only. [ queryport-pool-ports number ; ] [ queryport-pool-updateinterval number ; ] } ; ->>>>>>> 0de9ebf... [v9_11] fixed ARM grammars
@@ -10905,203 +10877,6 @@ view "external" {
<command>zone</command> Statement Grammar -<<<<<<< HEAD -zone zone_name class { - type master; - allow-query { address_match_list }; - allow-query-on { address_match_list }; - allow-transfer { address_match_list }; - allow-update { address_match_list }; - update-check-ksk yes_or_no; - dnssec-dnskey-kskonly yes_or_no; - dnssec-loadkeys-interval number; - update-policy local | { update_policy_rule ... }; - also-notify port ip_port dscp ip_dscp { ( masters_list | ip_addr - port ip_port - key key ) ; ... }; - check-names (warn|fail|ignore) ; - check-mx (warn|fail|ignore) ; - check-wildcard yes_or_no; - check-spf ( warn | ignore ); - check-integrity yes_or_no ; - dialup dialup_option ; - file string ; - masterfile-format (text|raw|map) ; - journal string ; - max-journal-size size_spec; - forward (only|first) ; - forwarders { ip_addr port ip_port dscp ip_dscp ; ... }; - ixfr-base string ; - ixfr-from-differences yes_or_no; - ixfr-tmp-file string ; - maintain-ixfr-base yes_or_no ; - max-ixfr-log-size number ; - max-transfer-idle-out number ; - max-transfer-time-out number ; - notify yes_or_no | explicit | master-only ; - notify-delay seconds ; - notify-to-soa yes_or_no; - pubkey number number number string ; - notify-source (ip4_addr | *) port ip_port dscp ip_dscp ; - notify-source-v6 (ip6_addr | *) port ip_port dscp ip_dscp ; - zone-statistics full | terse | none; - sig-validity-interval number number ; - sig-signing-nodes number ; - sig-signing-signatures number ; - sig-signing-type number ; - database string ; - min-refresh-time number ; - max-refresh-time number ; - min-retry-time number ; - max-retry-time number ; - key-directory path_name; - auto-dnssec allow|maintain|off; - inline-signing yes_or_no; - zero-no-soa-ttl yes_or_no ; - serial-update-method increment|unixtime; - max-zone-ttl number ; -}; - -zone zone_name class { - type slave; - allow-notify { address_match_list }; - allow-query { address_match_list }; - allow-query-on { address_match_list }; - allow-transfer { address_match_list }; - allow-update-forwarding { address_match_list }; - dnssec-update-mode ( maintain | no-resign ); - update-check-ksk yes_or_no; - dnssec-dnskey-kskonly yes_or_no; - dnssec-loadkeys-interval number; - dnssec-secure-to-insecure yes_or_no ; - try-tcp-refresh yes_or_no; - also-notify port ip_port dscp ip_dscp { ( masters_list | ip_addr - port ip_port - key key ) ; ... }; - check-names (warn|fail|ignore) ; - dialup dialup_option ; - file string ; - masterfile-format (text|raw|map) ; - journal string ; - max-journal-size size_spec; - forward (only|first) ; - forwarders { ip_addr port ip_port dscp ip_dscp ; ... }; - ixfr-base string ; - ixfr-from-differences yes_or_no; - ixfr-tmp-file string ; - request-ixfr yes_or_no ; - maintain-ixfr-base yes_or_no ; - masters port ip_port dscp ip_dscp { ( masters_list | ip_addr - port ip_port - dscp ip_dscp - key key ) ; ... }; - max-ixfr-log-size number ; - max-transfer-idle-in number ; - max-transfer-idle-out number ; - max-transfer-time-in number ; - max-transfer-time-out number ; - notify yes_or_no | explicit | master-only ; - notify-delay seconds ; - notify-to-soa yes_or_no; - pubkey number number number string ; - transfer-source (ip4_addr | *) port ip_port dscp ip_dscp ; - transfer-source-v6 (ip6_addr | *) port ip_port dscp ip_dscp ; - alt-transfer-source (ip4_addr | *) port ip_port dscp ip_dscp ; - alt-transfer-source-v6 (ip6_addr | *) - port ip_port - dscp ip_dscp ; - use-alt-transfer-source yes_or_no; - notify-source (ip4_addr | *) port ip_port dscp ip_dscp ; - notify-source-v6 (ip6_addr | *) port ip_port dscp ip_dscp ; - zone-statistics full | terse | none; - sig-validity-interval number number ; - sig-signing-nodes number ; - sig-signing-signatures number ; - sig-signing-type number ; - database string ; - min-refresh-time number ; - max-refresh-time number ; - min-retry-time number ; - max-retry-time number ; - key-directory path_name; - auto-dnssec allow|maintain|off; - inline-signing yes_or_no; - multi-master yes_or_no ; - zero-no-soa-ttl yes_or_no ; -}; - -zone zone_name class { - type hint; - file string ; - delegation-only yes_or_no ; - check-names (warn|fail|ignore) ; // Not Implemented. -}; - -zone zone_name class { - type stub; - allow-query { address_match_list }; - allow-query-on { address_match_list }; - check-names (warn|fail|ignore) ; - dialup dialup_option ; - delegation-only yes_or_no ; - file string ; - masterfile-format (text|raw|map) ; - forward (only|first) ; - forwarders { ip_addr port ip_port dscp ip_dscp ; ... }; - masters port ip_port dscp ip_dscp { ( masters_list | ip_addr - port ip_port - dscp ip_dscp - key key ) ; ... }; - max-transfer-idle-in number ; - max-transfer-time-in number ; - pubkey number number number string ; - transfer-source (ip4_addr | *) port ip_port dscp ip_dscp ; - transfer-source-v6 (ip6_addr | *) - port ip_port dscp ip_dscp ; - alt-transfer-source (ip4_addr | *) port ip_port dscp ip_dscp ; - alt-transfer-source-v6 (ip6_addr | *) - port ip_port dscp ip_dscp ; - use-alt-transfer-source yes_or_no; - zone-statistics full | terse | none; - database string ; - min-refresh-time number ; - max-refresh-time number ; - min-retry-time number ; - max-retry-time number ; - multi-master yes_or_no ; -}; - -zone zone_name class { - type static-stub; - allow-query { address_match_list }; - server-addresses { ip_addr ; ... }; - server-names { namelist }; - zone-statistics full | terse | none; -}; - -zone zone_name class { - type forward; - forward (only|first) ; - forwarders { ip_addr port ip_port dscp ip_dscp ; ... }; - delegation-only yes_or_no ; -}; - -zone "." class { - type redirect; - file string ; - masterfile-format (text|raw|map) ; - allow-query { address_match_list }; - max-zone-ttl number ; -}; - -zone zone_name class { - type delegation-only; -}; - -zone zone_name class { - in-view string ; -}; -======= zone zone_name [ class ] { type master ; [ allow-query { address_match_list } ; ] @@ -11307,7 +11082,6 @@ zone zone_name classzone zone_name [ class ] { [ in-view string ; ] } ; ->>>>>>> 0de9ebf... [v9_11] fixed ARM grammars