diff --git a/bin/rndc/rndc.conf b/bin/rndc/rndc.conf index f457cadacf..696d54b042 100644 --- a/bin/rndc/rndc.conf +++ b/bin/rndc/rndc.conf @@ -22,12 +22,12 @@ */ options { - default-server localhost; - default-key "key"; + default-server localhost; + default-key "key"; }; server localhost { - key "key"; + key "key"; }; key "cc64b3d1db63fc88d7cb5d2f9f57d258" { @@ -36,12 +36,12 @@ key "cc64b3d1db63fc88d7cb5d2f9f57d258" { }; server "test1" { - key "cc64b3d1db63fc88d7cb5d2f9f57d258"; + key "cc64b3d1db63fc88d7cb5d2f9f57d258"; port 5353; - addresses { 10.53.0.1; }; + addresses { 10.53.0.1; }; }; key "key" { - algorithm hmac-sha256; - secret "c3Ryb25nIGVub3VnaCBmb3IgYSBtYW4gYnV0IG1hZGUgZm9yIGEgd29tYW4K"; + algorithm hmac-sha256; + secret "c3Ryb25nIGVub3VnaCBmb3IgYSBtYW4gYnV0IG1hZGUgZm9yIGEgd29tYW4K"; }; diff --git a/bin/tests/system/acl/ns2/named5.conf b/bin/tests/system/acl/ns2/named5.conf index d17e1cf7b7..d2c5278a26 100644 --- a/bin/tests/system/acl/ns2/named5.conf +++ b/bin/tests/system/acl/ns2/named5.conf @@ -36,13 +36,13 @@ options { include "../../common/controls.conf"; key one { - algorithm hmac-md5; - secret "1234abcd8765"; + algorithm hmac-md5; + secret "1234abcd8765"; }; key two { - algorithm hmac-md5; - secret "1234abcd8765"; + algorithm hmac-md5; + secret "1234abcd8765"; }; zone "." { @@ -58,5 +58,5 @@ zone "example" { zone "tsigzone" { type master; file "tsigzone.db"; - allow-transfer { !key one; any; }; + allow-transfer { !key one; any; }; }; diff --git a/bin/tests/system/additional/ns1/named1.conf b/bin/tests/system/additional/ns1/named1.conf index 037f48186c..b5f47db724 100644 --- a/bin/tests/system/additional/ns1/named1.conf +++ b/bin/tests/system/additional/ns1/named1.conf @@ -33,7 +33,7 @@ options { include "../../common/rndc.key"; controls { - inet 10.53.0.1 port 9953 allow { any; } keys { rndc_key; }; + inet 10.53.0.1 port 9953 allow { any; } keys { rndc_key; }; }; zone "rt.example" { diff --git a/bin/tests/system/additional/ns1/named2.conf b/bin/tests/system/additional/ns1/named2.conf index c3adf9b335..cb165e8b29 100644 --- a/bin/tests/system/additional/ns1/named2.conf +++ b/bin/tests/system/additional/ns1/named2.conf @@ -27,13 +27,13 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; notify no; - minimal-responses no; + minimal-responses no; }; include "../../common/rndc.key"; controls { - inet 10.53.0.1 port 9953 allow { any; } keys { rndc_key; }; + inet 10.53.0.1 port 9953 allow { any; } keys { rndc_key; }; }; zone "rt.example" { diff --git a/bin/tests/system/addzone/ns1/named.conf b/bin/tests/system/addzone/ns1/named.conf index 42388d5d05..8ba6207840 100644 --- a/bin/tests/system/addzone/ns1/named.conf +++ b/bin/tests/system/addzone/ns1/named.conf @@ -23,8 +23,8 @@ options { pid-file "named.pid"; listen-on { 10.53.0.1; }; listen-on-v6 { none; }; - allow-query { any; }; - recursion no; + allow-query { any; }; + recursion no; }; zone "." { diff --git a/bin/tests/system/allow_query/ns2/named57.conf b/bin/tests/system/allow_query/ns2/named57.conf index c3d9e9f8c8..881e6a711b 100644 --- a/bin/tests/system/allow_query/ns2/named57.conf +++ b/bin/tests/system/allow_query/ns2/named57.conf @@ -21,7 +21,7 @@ options { pid-file "named.pid"; listen-on { 10.53.0.2; }; listen-on-v6 { none; }; - recursion no; + recursion no; }; include "../../common/controls.conf"; diff --git a/bin/tests/system/autosign/ns1/named.conf b/bin/tests/system/autosign/ns1/named.conf index d7526b4c88..3a2fcb370c 100644 --- a/bin/tests/system/autosign/ns1/named.conf +++ b/bin/tests/system/autosign/ns1/named.conf @@ -35,21 +35,21 @@ options { }; key rndc_key { - secret "1234abcd8765"; - algorithm hmac-sha256; + secret "1234abcd8765"; + algorithm hmac-sha256; }; controls { - inet 10.53.0.1 port 9953 allow { any; } keys { rndc_key; }; + inet 10.53.0.1 port 9953 allow { any; } keys { rndc_key; }; }; zone "." { type master; file "root.db"; - allow-transfer { any; }; - allow-query { any; }; - allow-update { any; }; - auto-dnssec maintain; + allow-transfer { any; }; + allow-query { any; }; + allow-update { any; }; + auto-dnssec maintain; }; include "trusted.conf"; diff --git a/bin/tests/system/autosign/ns3/named.conf b/bin/tests/system/autosign/ns3/named.conf index a7e0c40027..dbeebfd633 100644 --- a/bin/tests/system/autosign/ns3/named.conf +++ b/bin/tests/system/autosign/ns3/named.conf @@ -177,7 +177,7 @@ zone "secure-to-insecure2.example" { type master; file "secure-to-insecure2.example.db"; allow-update { any; }; - auto-dnssec maintain; + auto-dnssec maintain; dnssec-secure-to-insecure yes; }; diff --git a/bin/tests/system/checkconf/bad-dnssec.conf b/bin/tests/system/checkconf/bad-dnssec.conf index de888c80a4..c448623848 100644 --- a/bin/tests/system/checkconf/bad-dnssec.conf +++ b/bin/tests/system/checkconf/bad-dnssec.conf @@ -17,20 +17,20 @@ /* $Id$ */ zone not-inline { - type slave; - masters { 127.0.0.1; }; - inline-signing no; - dnssec-dnskey-kskonly yes; - update-check-ksk yes; - dnssec-loadkeys-interval 10; + type slave; + masters { 127.0.0.1; }; + inline-signing no; + dnssec-dnskey-kskonly yes; + update-check-ksk yes; + dnssec-loadkeys-interval 10; }; zone inline { - type slave; - masters { 127.0.0.1; }; - inline-signing yes; - dnssec-dnskey-kskonly yes; - update-check-ksk yes; - dnssec-loadkeys-interval 10; + type slave; + masters { 127.0.0.1; }; + inline-signing yes; + dnssec-dnskey-kskonly yes; + update-check-ksk yes; + dnssec-loadkeys-interval 10; }; diff --git a/bin/tests/system/checkconf/bad-inline-slave.conf b/bin/tests/system/checkconf/bad-inline-slave.conf index 5979f62869..b16a93d770 100644 --- a/bin/tests/system/checkconf/bad-inline-slave.conf +++ b/bin/tests/system/checkconf/bad-inline-slave.conf @@ -17,9 +17,9 @@ /* * An inline-signing slave should be forced to have a file option */ - + zone "." { - type slave; - inline-signing yes; - masters { 10.53.0.1; }; + type slave; + inline-signing yes; + masters { 10.53.0.1; }; }; \ No newline at end of file diff --git a/bin/tests/system/checkconf/dlz-bad.conf b/bin/tests/system/checkconf/dlz-bad.conf index c3183e1a15..686969edfa 100644 --- a/bin/tests/system/checkconf/dlz-bad.conf +++ b/bin/tests/system/checkconf/dlz-bad.conf @@ -17,16 +17,16 @@ /* $Id$ */ dlz one { - database "one"; + database "one"; }; dlz two { - database "two"; - search no; + database "two"; + search no; }; zone master { - type master; - database "none"; - dlz two; + type master; + database "none"; + dlz two; }; diff --git a/bin/tests/system/checkconf/inline-bad.conf b/bin/tests/system/checkconf/inline-bad.conf index de9c4a2ea5..49f4726bc6 100644 --- a/bin/tests/system/checkconf/inline-bad.conf +++ b/bin/tests/system/checkconf/inline-bad.conf @@ -18,13 +18,13 @@ acl "transferees" {}; masters "stealthMasters" {127.0.0.1;}; masters "publicSlaves" {127.0.0.1;}; zone "example.net" { - type slave; - key-directory "/var/lib/bind/example.net"; - auto-dnssec maintain; - inline-signing yes; - masters { stealthMasters; }; - notify explicit; - also-notify { publicSlaves; }; - allow-transfer { localhost; transferees; }; + type slave; + key-directory "/var/lib/bind/example.net"; + auto-dnssec maintain; + inline-signing yes; + masters { stealthMasters; }; + notify explicit; + also-notify { publicSlaves; }; + allow-transfer { localhost; transferees; }; }; diff --git a/bin/tests/system/checkconf/inline-good.conf b/bin/tests/system/checkconf/inline-good.conf index 84a6a84098..21a7eb0ec3 100644 --- a/bin/tests/system/checkconf/inline-good.conf +++ b/bin/tests/system/checkconf/inline-good.conf @@ -18,14 +18,14 @@ acl "transferees" {}; masters "stealthMasters" {127.0.0.1;}; masters "publicSlaves" {127.0.0.1;}; zone "example.net" { - type slave; - file "/var/cache/bind/example.net.db"; - key-directory "/var/lib/bind/example.net"; - auto-dnssec maintain; - inline-signing yes; - masters { stealthMasters; }; - notify explicit; - also-notify { publicSlaves; }; - allow-transfer { localhost; transferees; }; + type slave; + file "/var/cache/bind/example.net.db"; + key-directory "/var/lib/bind/example.net"; + auto-dnssec maintain; + inline-signing yes; + masters { stealthMasters; }; + notify explicit; + also-notify { publicSlaves; }; + allow-transfer { localhost; transferees; }; }; diff --git a/bin/tests/system/checkconf/inline-no.conf b/bin/tests/system/checkconf/inline-no.conf index 2027b94322..1702ce0804 100644 --- a/bin/tests/system/checkconf/inline-no.conf +++ b/bin/tests/system/checkconf/inline-no.conf @@ -18,13 +18,13 @@ acl "transferees" {}; masters "stealthMasters" {127.0.0.1;}; masters "publicSlaves" {127.0.0.1;}; zone "example.net" { - type slave; - key-directory "/var/lib/bind/example.net"; - auto-dnssec maintain; - inline-signing no; - masters { stealthMasters; }; - notify explicit; - also-notify { publicSlaves; }; - allow-transfer { localhost; transferees; }; + type slave; + key-directory "/var/lib/bind/example.net"; + auto-dnssec maintain; + inline-signing no; + masters { stealthMasters; }; + notify explicit; + also-notify { publicSlaves; }; + allow-transfer { localhost; transferees; }; }; diff --git a/bin/tests/system/checkconf/range.conf b/bin/tests/system/checkconf/range.conf index 406869a372..b88e98be16 100644 --- a/bin/tests/system/checkconf/range.conf +++ b/bin/tests/system/checkconf/range.conf @@ -16,13 +16,13 @@ options { port 999999; - dscp 222; + dscp 222; listen-on port 100 dscp 444 { 127.0.0.1/32; }; }; zone "example" { - type master; - file "example.db"; + type master; + file "example.db"; }; diff --git a/bin/tests/system/common/controls.conf b/bin/tests/system/common/controls.conf index 116be63d89..ebecf8c5ad 100644 --- a/bin/tests/system/common/controls.conf +++ b/bin/tests/system/common/controls.conf @@ -18,11 +18,11 @@ /* $Id: controls.conf,v 1.6 2007/06/19 23:47:01 tbox Exp $ */ key rndc_key { - secret "1234abcd8765"; - algorithm hmac-sha256; + secret "1234abcd8765"; + algorithm hmac-sha256; }; controls { - inet 10.53.0.2 port 9953 allow { any; } keys { rndc_key; }; + inet 10.53.0.2 port 9953 allow { any; } keys { rndc_key; }; }; diff --git a/bin/tests/system/common/rndc.conf b/bin/tests/system/common/rndc.conf index 0e107738a0..9adecf9f40 100644 --- a/bin/tests/system/common/rndc.conf +++ b/bin/tests/system/common/rndc.conf @@ -18,10 +18,10 @@ /* $Id: rndc.conf,v 1.5 2007/06/19 23:47:01 tbox Exp $ */ options { - default-key "rndc_key"; + default-key "rndc_key"; }; key rndc_key { - algorithm hmac-sha256; - secret "1234abcd8765"; + algorithm hmac-sha256; + secret "1234abcd8765"; }; diff --git a/bin/tests/system/common/rndc.key b/bin/tests/system/common/rndc.key index 641e1b792b..cac7540564 100644 --- a/bin/tests/system/common/rndc.key +++ b/bin/tests/system/common/rndc.key @@ -17,6 +17,6 @@ /* $Id: rndc.key,v 1.3 2011/03/12 04:59:47 tbox Exp $ */ key rndc_key { - secret "1234abcd8765"; - algorithm hmac-sha256; + secret "1234abcd8765"; + algorithm hmac-sha256; }; diff --git a/bin/tests/system/database/ns1/named.conf1 b/bin/tests/system/database/ns1/named.conf1 index c1789ecd7e..9a4f7116c3 100644 --- a/bin/tests/system/database/ns1/named.conf1 +++ b/bin/tests/system/database/ns1/named.conf1 @@ -19,12 +19,12 @@ // NS1 key rndc_key { - secret "1234abcd8765"; - algorithm hmac-sha256; + secret "1234abcd8765"; + algorithm hmac-sha256; }; controls { - inet 10.53.0.1 port 9953 allow { any; } keys { rndc_key; }; + inet 10.53.0.1 port 9953 allow { any; } keys { rndc_key; }; }; options { diff --git a/bin/tests/system/database/ns1/named.conf2 b/bin/tests/system/database/ns1/named.conf2 index 3137766741..a64e5eeef4 100644 --- a/bin/tests/system/database/ns1/named.conf2 +++ b/bin/tests/system/database/ns1/named.conf2 @@ -19,12 +19,12 @@ // NS1 key rndc_key { - secret "1234abcd8765"; - algorithm hmac-sha256; + secret "1234abcd8765"; + algorithm hmac-sha256; }; controls { - inet 10.53.0.1 port 9953 allow { any; } keys { rndc_key; }; + inet 10.53.0.1 port 9953 allow { any; } keys { rndc_key; }; }; options { diff --git a/bin/tests/system/dlv/ns5/named.conf b/bin/tests/system/dlv/ns5/named.conf index 0af6706fd2..1b102a6d5b 100644 --- a/bin/tests/system/dlv/ns5/named.conf +++ b/bin/tests/system/dlv/ns5/named.conf @@ -25,7 +25,7 @@ * key "cc64b3d1db63fc88d7cb5d2f9f57d258" { * algorithm hmac-sha256; * secret "34f88008d07deabbe65bd01f1d233d47"; - * }; + * }; * * server "10.53.0.5" { * key cc64b3d1db63fc88d7cb5d2f9f57d258; diff --git a/bin/tests/system/dlv/ns5/rndc.conf b/bin/tests/system/dlv/ns5/rndc.conf index 84262f6773..a19a9cc53e 100644 --- a/bin/tests/system/dlv/ns5/rndc.conf +++ b/bin/tests/system/dlv/ns5/rndc.conf @@ -19,8 +19,8 @@ key "cc64b3d1db63fc88d7cb5d2f9f57d258" { algorithm hmac-sha256; secret "34f88008d07deabbe65bd01f1d233d47"; -}; - +}; + options { default-server 10.53.0.5; default-port 5353; diff --git a/bin/tests/system/dlvauto/ns2/named.conf b/bin/tests/system/dlvauto/ns2/named.conf index faad7a7267..6f67c35d9f 100644 --- a/bin/tests/system/dlvauto/ns2/named.conf +++ b/bin/tests/system/dlvauto/ns2/named.conf @@ -36,12 +36,12 @@ options { }; key rndc_key { - secret "1234abcd8765"; - algorithm hmac-sha256; + secret "1234abcd8765"; + algorithm hmac-sha256; }; controls { - inet 10.53.0.2 port 9953 allow { any; } keys { rndc_key; }; + inet 10.53.0.2 port 9953 allow { any; } keys { rndc_key; }; }; view "in" { @@ -57,5 +57,5 @@ view "ch" ch { }; view "unused" { - match-clients { none; }; + match-clients { none; }; }; diff --git a/bin/tests/system/dlzexternal/ns1/named.conf.in b/bin/tests/system/dlzexternal/ns1/named.conf.in index 31a0dd8351..2127c772cd 100644 --- a/bin/tests/system/dlzexternal/ns1/named.conf.in +++ b/bin/tests/system/dlzexternal/ns1/named.conf.in @@ -51,16 +51,16 @@ dlz "example two" { }; dlz "unsearched1" { - database "dlopen ../driver.@SO@ other.nil"; - search no; + database "dlopen ../driver.@SO@ other.nil"; + search no; }; dlz "unsearched2" { - database "dlopen ../driver.@SO@ zone.nil"; - search no; + database "dlopen ../driver.@SO@ zone.nil"; + search no; }; zone zone.nil { - type master; - dlz unsearched2; + type master; + dlz unsearched2; }; diff --git a/bin/tests/system/dns64/ns2/named.conf b/bin/tests/system/dns64/ns2/named.conf index d1f4776c2d..afd28dfa1b 100644 --- a/bin/tests/system/dns64/ns2/named.conf +++ b/bin/tests/system/dns64/ns2/named.conf @@ -35,19 +35,19 @@ options { dnssec-enable yes; dnssec-validation yes; - dns64 2001:aaaa::/96 { - clients { 10.53.0.2; }; - mapped { !rfc1918; any; }; - exclude { 2001:eeee::/32; 64:FF9B::/96; ::ffff:0000:0000/96; }; - suffix ::; - }; + dns64 2001:aaaa::/96 { + clients { 10.53.0.2; }; + mapped { !rfc1918; any; }; + exclude { 2001:eeee::/32; 64:FF9B::/96; ::ffff:0000:0000/96; }; + suffix ::; + }; - dns64 64:FF9B::/96 { - clients { 10.53.0.1; }; - mapped { !192.228.79.201; !rfc1918; any; }; - exclude { 64:FF9B::/96; ::ffff:0000:0000/96; }; - suffix ::; - }; + dns64 64:FF9B::/96 { + clients { 10.53.0.1; }; + mapped { !192.228.79.201; !rfc1918; any; }; + exclude { 64:FF9B::/96; ::ffff:0000:0000/96; }; + suffix ::; + }; dns64-server "dns64.example.net."; dns64-contact "hostmaster.example.net."; @@ -59,7 +59,7 @@ options { dns64 2001:96::/96 { clients { 10.53.0.7; }; }; - response-policy { zone "rpz"; }; + response-policy { zone "rpz"; }; }; zone "." { diff --git a/bin/tests/system/dnssec/ns3/named.conf b/bin/tests/system/dnssec/ns3/named.conf index d87a452fca..23b9d1d6a9 100644 --- a/bin/tests/system/dnssec/ns3/named.conf +++ b/bin/tests/system/dnssec/ns3/named.conf @@ -37,12 +37,12 @@ options { }; key rndc_key { - secret "1234abcd8765"; - algorithm hmac-sha256; + secret "1234abcd8765"; + algorithm hmac-sha256; }; controls { - inet 10.53.0.3 port 9953 allow { any; } keys { rndc_key; }; + inet 10.53.0.3 port 9953 allow { any; } keys { rndc_key; }; }; zone "." { @@ -228,14 +228,14 @@ zone "split-smart.example" { }; zone "nsec3chain-test" { - type slave; - file "nsec3chain-test.bk"; + type slave; + file "nsec3chain-test.bk"; masters { 10.53.0.2; }; }; zone "expiring.example" { type master; - allow-update { any; }; + allow-update { any; }; file "expiring.example.db.signed"; }; @@ -257,10 +257,10 @@ zone "LOWER.EXAMPLE" { }; zone "inline.example" { - type master; - file "inline.example.db"; - inline-signing yes; - auto-dnssec maintain; + type master; + file "inline.example.db"; + inline-signing yes; + auto-dnssec maintain; }; zone "publish-inactive.example" { diff --git a/bin/tests/system/dnssec/ns3/siginterval1.conf b/bin/tests/system/dnssec/ns3/siginterval1.conf index bb3d4b81ba..fb0b342f59 100644 --- a/bin/tests/system/dnssec/ns3/siginterval1.conf +++ b/bin/tests/system/dnssec/ns3/siginterval1.conf @@ -15,9 +15,9 @@ */ zone "siginterval.example" { - type master; - allow-update { any; }; + type master; + allow-update { any; }; sig-validity-interval 1 23; auto-dnssec maintain; - file "siginterval.example.db"; + file "siginterval.example.db"; }; diff --git a/bin/tests/system/dnssec/ns3/siginterval2.conf b/bin/tests/system/dnssec/ns3/siginterval2.conf index a4fc5ad413..03be0d2bae 100644 --- a/bin/tests/system/dnssec/ns3/siginterval2.conf +++ b/bin/tests/system/dnssec/ns3/siginterval2.conf @@ -15,9 +15,9 @@ */ zone "siginterval.example" { - type master; - allow-update { any; }; + type master; + allow-update { any; }; sig-validity-interval 35 28; auto-dnssec maintain; - file "siginterval.example.db"; + file "siginterval.example.db"; }; diff --git a/bin/tests/system/dnssec/ns4/named1.conf b/bin/tests/system/dnssec/ns4/named1.conf index d69652a1d7..2cc3034992 100644 --- a/bin/tests/system/dnssec/ns4/named1.conf +++ b/bin/tests/system/dnssec/ns4/named1.conf @@ -34,21 +34,21 @@ options { dnssec-validation yes; dnssec-must-be-secure mustbesecure.example yes; - # Note: We only reference the bind.keys file here to confirm that it - # is *not* being used. It contains the real root key, and we're - # using a local toy root zone for the tests, so it wouldn't work. - # But since dnssec-validation is set to "yes" not "auto", that - # won't matter. - bindkeys-file "../../../../../bind.keys"; + # Note: We only reference the bind.keys file here to confirm that it + # is *not* being used. It contains the real root key, and we're + # using a local toy root zone for the tests, so it wouldn't work. + # But since dnssec-validation is set to "yes" not "auto", that + # won't matter. + bindkeys-file "../../../../../bind.keys"; }; key rndc_key { - secret "1234abcd8765"; - algorithm hmac-sha256; + secret "1234abcd8765"; + algorithm hmac-sha256; }; controls { - inet 10.53.0.4 port 9953 allow { any; } keys { rndc_key; }; + inet 10.53.0.4 port 9953 allow { any; } keys { rndc_key; }; }; zone "." { diff --git a/bin/tests/system/dnssec/ns4/named2.conf b/bin/tests/system/dnssec/ns4/named2.conf index 0158e03a8f..eb302a1546 100644 --- a/bin/tests/system/dnssec/ns4/named2.conf +++ b/bin/tests/system/dnssec/ns4/named2.conf @@ -24,7 +24,7 @@ options { query-source address 10.53.0.4 dscp 4; notify-source 10.53.0.4 dscp 5; transfer-source 10.53.0.4 dscp 6; - dscp 16; + dscp 16; port 5300; pid-file "named.pid"; listen-on { 10.53.0.4; }; @@ -33,16 +33,16 @@ options { acache-enable yes; dnssec-enable yes; dnssec-validation auto; - bindkeys-file "managed.conf"; + bindkeys-file "managed.conf"; }; key rndc_key { - secret "1234abcd8765"; - algorithm hmac-sha256; + secret "1234abcd8765"; + algorithm hmac-sha256; }; controls { - inet 10.53.0.4 port 9953 allow { any; } keys { rndc_key; }; + inet 10.53.0.4 port 9953 allow { any; } keys { rndc_key; }; }; zone "." { diff --git a/bin/tests/system/dnssec/ns4/named3.conf b/bin/tests/system/dnssec/ns4/named3.conf index 801bf95ad8..de6abb912f 100644 --- a/bin/tests/system/dnssec/ns4/named3.conf +++ b/bin/tests/system/dnssec/ns4/named3.conf @@ -32,17 +32,17 @@ options { acache-enable yes; dnssec-enable yes; dnssec-validation auto; - bindkeys-file "managed.conf"; - dnssec-accept-expired yes; + bindkeys-file "managed.conf"; + dnssec-accept-expired yes; }; key rndc_key { - secret "1234abcd8765"; - algorithm hmac-sha256; + secret "1234abcd8765"; + algorithm hmac-sha256; }; controls { - inet 10.53.0.4 port 9953 allow { any; } keys { rndc_key; }; + inet 10.53.0.4 port 9953 allow { any; } keys { rndc_key; }; }; zone "." { diff --git a/bin/tests/system/filter-aaaa/ns2/named1.conf b/bin/tests/system/filter-aaaa/ns2/named1.conf index f1dd0e69f9..ecdbdf03de 100644 --- a/bin/tests/system/filter-aaaa/ns2/named1.conf +++ b/bin/tests/system/filter-aaaa/ns2/named1.conf @@ -28,8 +28,8 @@ options { listen-on-v6 { fd92:7065:b8e:ffff::2; }; recursion yes; notify yes; - filter-aaaa-on-v4 yes; - filter-aaaa { 10.53.0.2; }; + filter-aaaa-on-v4 yes; + filter-aaaa { 10.53.0.2; }; }; key rndc_key { diff --git a/bin/tests/system/filter-aaaa/ns2/named2.conf b/bin/tests/system/filter-aaaa/ns2/named2.conf index 6fed4f1703..16a76243b0 100644 --- a/bin/tests/system/filter-aaaa/ns2/named2.conf +++ b/bin/tests/system/filter-aaaa/ns2/named2.conf @@ -28,7 +28,7 @@ options { listen-on-v6 { fd92:7065:b8e:ffff::2; }; recursion yes; notify yes; - filter-aaaa-on-v6 yes; + filter-aaaa-on-v6 yes; filter-aaaa { fd92:7065:b8e:ffff::2; }; }; diff --git a/bin/tests/system/filter-aaaa/ns3/named1.conf b/bin/tests/system/filter-aaaa/ns3/named1.conf index cafacbbbb5..c7490d5d80 100644 --- a/bin/tests/system/filter-aaaa/ns3/named1.conf +++ b/bin/tests/system/filter-aaaa/ns3/named1.conf @@ -28,8 +28,8 @@ options { listen-on-v6 { fd92:7065:b8e:ffff::3; }; recursion yes; notify yes; - filter-aaaa-on-v4 break-dnssec; - filter-aaaa { 10.53.0.3; }; + filter-aaaa-on-v4 break-dnssec; + filter-aaaa { 10.53.0.3; }; }; key rndc_key { diff --git a/bin/tests/system/filter-aaaa/ns3/named2.conf b/bin/tests/system/filter-aaaa/ns3/named2.conf index 87f4f2129b..9cb7d6054d 100644 --- a/bin/tests/system/filter-aaaa/ns3/named2.conf +++ b/bin/tests/system/filter-aaaa/ns3/named2.conf @@ -28,7 +28,7 @@ options { listen-on-v6 { fd92:7065:b8e:ffff::3; }; recursion yes; notify yes; - filter-aaaa-on-v6 break-dnssec; + filter-aaaa-on-v6 break-dnssec; filter-aaaa { fd92:7065:b8e:ffff::3; }; }; diff --git a/bin/tests/system/geoip/ns2/named1.conf b/bin/tests/system/geoip/ns2/named1.conf index fc0fb9384a..367b5c7fa6 100644 --- a/bin/tests/system/geoip/ns2/named1.conf +++ b/bin/tests/system/geoip/ns2/named1.conf @@ -40,65 +40,65 @@ controls { }; view one { - match-clients { geoip db country country AU; }; - zone "example" { - type master; - file "example1.db"; - }; + match-clients { geoip db country country AU; }; + zone "example" { + type master; + file "example1.db"; + }; }; view two { - match-clients { geoip db country country US; }; - zone "example" { - type master; - file "example2.db"; - }; + match-clients { geoip db country country US; }; + zone "example" { + type master; + file "example2.db"; + }; }; view three { - match-clients { geoip db country country GB; }; - zone "example" { - type master; - file "example3.db"; - }; + match-clients { geoip db country country GB; }; + zone "example" { + type master; + file "example3.db"; + }; }; view four { - match-clients { geoip db country country CA; }; - zone "example" { - type master; - file "example4.db"; - }; + match-clients { geoip db country country CA; }; + zone "example" { + type master; + file "example4.db"; + }; }; view five { - match-clients { geoip db country country CL; }; - zone "example" { - type master; - file "example5.db"; - }; + match-clients { geoip db country country CL; }; + zone "example" { + type master; + file "example5.db"; + }; }; view six { - match-clients { geoip db country country DE; }; - zone "example" { - type master; - file "example6.db"; - }; + match-clients { geoip db country country DE; }; + zone "example" { + type master; + file "example6.db"; + }; }; view seven { - match-clients { geoip db country country EH; }; - zone "example" { - type master; - file "example7.db"; - }; + match-clients { geoip db country country EH; }; + zone "example" { + type master; + file "example7.db"; + }; }; view none { - match-clients { any; }; - zone "example" { - type master; - file "example.db.in"; - }; + match-clients { any; }; + zone "example" { + type master; + file "example.db.in"; + }; }; diff --git a/bin/tests/system/geoip/ns2/named10.conf b/bin/tests/system/geoip/ns2/named10.conf index e0dee5431c..1ceece41cf 100644 --- a/bin/tests/system/geoip/ns2/named10.conf +++ b/bin/tests/system/geoip/ns2/named10.conf @@ -40,65 +40,65 @@ controls { }; view one { - match-clients { geoip domain one.de; }; - zone "example" { - type master; - file "example1.db"; - }; + match-clients { geoip domain one.de; }; + zone "example" { + type master; + file "example1.db"; + }; }; view two { - match-clients { geoip domain two.com; }; - zone "example" { - type master; - file "example2.db"; - }; + match-clients { geoip domain two.com; }; + zone "example" { + type master; + file "example2.db"; + }; }; view three { - match-clients { geoip domain three.com; }; - zone "example" { - type master; - file "example3.db"; - }; + match-clients { geoip domain three.com; }; + zone "example" { + type master; + file "example3.db"; + }; }; view four { - match-clients { geoip domain four.com; }; - zone "example" { - type master; - file "example4.db"; - }; + match-clients { geoip domain four.com; }; + zone "example" { + type master; + file "example4.db"; + }; }; view five { - match-clients { geoip domain five.es; }; - zone "example" { - type master; - file "example5.db"; - }; + match-clients { geoip domain five.es; }; + zone "example" { + type master; + file "example5.db"; + }; }; view six { - match-clients { geoip domain six.it; }; - zone "example" { - type master; - file "example6.db"; - }; + match-clients { geoip domain six.it; }; + zone "example" { + type master; + file "example6.db"; + }; }; view seven { - match-clients { geoip domain seven.org; }; - zone "example" { - type master; - file "example7.db"; - }; + match-clients { geoip domain seven.org; }; + zone "example" { + type master; + file "example7.db"; + }; }; view none { - match-clients { any; }; - zone "example" { - type master; - file "example.db.in"; - }; + match-clients { any; }; + zone "example" { + type master; + file "example.db.in"; + }; }; diff --git a/bin/tests/system/geoip/ns2/named11.conf b/bin/tests/system/geoip/ns2/named11.conf index 7933fd69b5..85c0d32c34 100644 --- a/bin/tests/system/geoip/ns2/named11.conf +++ b/bin/tests/system/geoip/ns2/named11.conf @@ -40,41 +40,41 @@ controls { }; view one { - match-clients { geoip netspeed 0; }; - zone "example" { - type master; - file "example1.db"; - }; + match-clients { geoip netspeed 0; }; + zone "example" { + type master; + file "example1.db"; + }; }; view two { - match-clients { geoip netspeed 1; }; - zone "example" { - type master; - file "example2.db"; - }; + match-clients { geoip netspeed 1; }; + zone "example" { + type master; + file "example2.db"; + }; }; view three { - match-clients { geoip netspeed 2; }; - zone "example" { - type master; - file "example3.db"; - }; + match-clients { geoip netspeed 2; }; + zone "example" { + type master; + file "example3.db"; + }; }; view four { - match-clients { geoip netspeed 3; }; - zone "example" { - type master; - file "example4.db"; - }; + match-clients { geoip netspeed 3; }; + zone "example" { + type master; + file "example4.db"; + }; }; view none { - match-clients { any; }; - zone "example" { - type master; - file "example.db.in"; - }; + match-clients { any; }; + zone "example" { + type master; + file "example.db.in"; + }; }; diff --git a/bin/tests/system/geoip/ns2/named2.conf b/bin/tests/system/geoip/ns2/named2.conf index 29876b8101..a86af10ffa 100644 --- a/bin/tests/system/geoip/ns2/named2.conf +++ b/bin/tests/system/geoip/ns2/named2.conf @@ -40,65 +40,65 @@ controls { }; view one { - match-clients { geoip db country country AUS; }; - zone "example" { - type master; - file "example1.db"; - }; + match-clients { geoip db country country AUS; }; + zone "example" { + type master; + file "example1.db"; + }; }; view two { - match-clients { geoip db country country USA; }; - zone "example" { - type master; - file "example2.db"; - }; + match-clients { geoip db country country USA; }; + zone "example" { + type master; + file "example2.db"; + }; }; view three { - match-clients { geoip db country country GBR; }; - zone "example" { - type master; - file "example3.db"; - }; + match-clients { geoip db country country GBR; }; + zone "example" { + type master; + file "example3.db"; + }; }; view four { - match-clients { geoip db country country CAN; }; - zone "example" { - type master; - file "example4.db"; - }; + match-clients { geoip db country country CAN; }; + zone "example" { + type master; + file "example4.db"; + }; }; view five { - match-clients { geoip db country country CHL; }; - zone "example" { - type master; - file "example5.db"; - }; + match-clients { geoip db country country CHL; }; + zone "example" { + type master; + file "example5.db"; + }; }; view six { - match-clients { geoip db country country DEU; }; - zone "example" { - type master; - file "example6.db"; - }; + match-clients { geoip db country country DEU; }; + zone "example" { + type master; + file "example6.db"; + }; }; view seven { - match-clients { geoip db country country ESH; }; - zone "example" { - type master; - file "example7.db"; - }; + match-clients { geoip db country country ESH; }; + zone "example" { + type master; + file "example7.db"; + }; }; view none { - match-clients { any; }; - zone "example" { - type master; - file "example.db.in"; - }; + match-clients { any; }; + zone "example" { + type master; + file "example.db.in"; + }; }; diff --git a/bin/tests/system/geoip/ns2/named3.conf b/bin/tests/system/geoip/ns2/named3.conf index 525199e947..47deb569c7 100644 --- a/bin/tests/system/geoip/ns2/named3.conf +++ b/bin/tests/system/geoip/ns2/named3.conf @@ -40,65 +40,65 @@ controls { }; view one { - match-clients { geoip db country country Australia; }; - zone "example" { - type master; - file "example1.db"; - }; + match-clients { geoip db country country Australia; }; + zone "example" { + type master; + file "example1.db"; + }; }; view two { - match-clients { geoip db country country "United States"; }; - zone "example" { - type master; - file "example2.db"; - }; + match-clients { geoip db country country "United States"; }; + zone "example" { + type master; + file "example2.db"; + }; }; view three { - match-clients { geoip db country country "United Kingdom"; }; - zone "example" { - type master; - file "example3.db"; - }; + match-clients { geoip db country country "United Kingdom"; }; + zone "example" { + type master; + file "example3.db"; + }; }; view four { - match-clients { geoip db country country Canada; }; - zone "example" { - type master; - file "example4.db"; - }; + match-clients { geoip db country country Canada; }; + zone "example" { + type master; + file "example4.db"; + }; }; view five { - match-clients { geoip db country country Chile; }; - zone "example" { - type master; - file "example5.db"; - }; + match-clients { geoip db country country Chile; }; + zone "example" { + type master; + file "example5.db"; + }; }; view six { - match-clients { geoip db country country Germany; }; - zone "example" { - type master; - file "example6.db"; - }; + match-clients { geoip db country country Germany; }; + zone "example" { + type master; + file "example6.db"; + }; }; view seven { - match-clients { geoip db country country "Western Sahara"; }; - zone "example" { - type master; - file "example7.db"; - }; + match-clients { geoip db country country "Western Sahara"; }; + zone "example" { + type master; + file "example7.db"; + }; }; view none { - match-clients { any; }; - zone "example" { - type master; - file "example.db.in"; - }; + match-clients { any; }; + zone "example" { + type master; + file "example.db.in"; + }; }; diff --git a/bin/tests/system/geoip/ns2/named4.conf b/bin/tests/system/geoip/ns2/named4.conf index 093811464a..c94b1c75eb 100644 --- a/bin/tests/system/geoip/ns2/named4.conf +++ b/bin/tests/system/geoip/ns2/named4.conf @@ -40,57 +40,57 @@ controls { }; view one { - match-clients { geoip region CA; }; - zone "example" { - type master; - file "example1.db"; - }; + match-clients { geoip region CA; }; + zone "example" { + type master; + file "example1.db"; + }; }; view three { - match-clients { geoip region OK; }; - zone "example" { - type master; - file "example3.db"; - }; + match-clients { geoip region OK; }; + zone "example" { + type master; + file "example3.db"; + }; }; view four { - match-clients { geoip region VA; }; - zone "example" { - type master; - file "example4.db"; - }; + match-clients { geoip region VA; }; + zone "example" { + type master; + file "example4.db"; + }; }; view five { - match-clients { geoip region GA; }; - zone "example" { - type master; - file "example5.db"; - }; + match-clients { geoip region GA; }; + zone "example" { + type master; + file "example5.db"; + }; }; view six { - match-clients { geoip region CO; }; - zone "example" { - type master; - file "example6.db"; - }; + match-clients { geoip region CO; }; + zone "example" { + type master; + file "example6.db"; + }; }; view seven { - match-clients { geoip region AK; }; - zone "example" { - type master; - file "example7.db"; - }; + match-clients { geoip region AK; }; + zone "example" { + type master; + file "example7.db"; + }; }; view none { - match-clients { any; }; - zone "example" { - type master; - file "example.db.in"; - }; + match-clients { any; }; + zone "example" { + type master; + file "example.db.in"; + }; }; diff --git a/bin/tests/system/geoip/ns2/named5.conf b/bin/tests/system/geoip/ns2/named5.conf index 20cd56e9e0..3b0011afec 100644 --- a/bin/tests/system/geoip/ns2/named5.conf +++ b/bin/tests/system/geoip/ns2/named5.conf @@ -40,65 +40,65 @@ controls { }; view one { - match-clients { geoip db region region "California"; }; - zone "example" { - type master; - file "example1.db"; - }; + match-clients { geoip db region region "California"; }; + zone "example" { + type master; + file "example1.db"; + }; }; view two { - match-clients { geoip db region region "British Columbia"; }; - zone "example" { - type master; - file "example2.db"; - }; + match-clients { geoip db region region "British Columbia"; }; + zone "example" { + type master; + file "example2.db"; + }; }; view three { - match-clients { geoip db region region "Oklahoma"; }; - zone "example" { - type master; - file "example3.db"; - }; + match-clients { geoip db region region "Oklahoma"; }; + zone "example" { + type master; + file "example3.db"; + }; }; view four { - match-clients { geoip db region country AU; }; - zone "example" { - type master; - file "example4.db"; - }; + match-clients { geoip db region country AU; }; + zone "example" { + type master; + file "example4.db"; + }; }; view five { - match-clients { geoip db region region "Colorado"; }; - zone "example" { - type master; - file "example5.db"; - }; + match-clients { geoip db region region "Colorado"; }; + zone "example" { + type master; + file "example5.db"; + }; }; view six { - match-clients { geoip db region region "Ontario"; }; - zone "example" { - type master; - file "example6.db"; - }; + match-clients { geoip db region region "Ontario"; }; + zone "example" { + type master; + file "example6.db"; + }; }; view seven { - match-clients { geoip db region country NL; }; - zone "example" { - type master; - file "example7.db"; - }; + match-clients { geoip db region country NL; }; + zone "example" { + type master; + file "example7.db"; + }; }; view none { - match-clients { any; }; - zone "example" { - type master; - file "example.db.in"; - }; + match-clients { any; }; + zone "example" { + type master; + file "example.db.in"; + }; }; diff --git a/bin/tests/system/geoip/ns2/named6.conf b/bin/tests/system/geoip/ns2/named6.conf index 340754967e..3e54a0c61f 100644 --- a/bin/tests/system/geoip/ns2/named6.conf +++ b/bin/tests/system/geoip/ns2/named6.conf @@ -40,65 +40,65 @@ controls { }; view one { - match-clients { geoip city "Redwood City"; }; - zone "example" { - type master; - file "example1.db"; - }; + match-clients { geoip city "Redwood City"; }; + zone "example" { + type master; + file "example1.db"; + }; }; view two { - match-clients { geoip city "Santa Cruz"; }; - zone "example" { - type master; - file "example2.db"; - }; + match-clients { geoip city "Santa Cruz"; }; + zone "example" { + type master; + file "example2.db"; + }; }; view three { - match-clients { geoip city "Oklahoma City"; }; - zone "example" { - type master; - file "example3.db"; - }; + match-clients { geoip city "Oklahoma City"; }; + zone "example" { + type master; + file "example3.db"; + }; }; view four { - match-clients { geoip city "Ashland"; }; - zone "example" { - type master; - file "example4.db"; - }; + match-clients { geoip city "Ashland"; }; + zone "example" { + type master; + file "example4.db"; + }; }; view five { - match-clients { geoip city "Atlanta"; }; - zone "example" { - type master; - file "example5.db"; - }; + match-clients { geoip city "Atlanta"; }; + zone "example" { + type master; + file "example5.db"; + }; }; view six { - match-clients { geoip city "Morrison"; }; - zone "example" { - type master; - file "example6.db"; - }; + match-clients { geoip city "Morrison"; }; + zone "example" { + type master; + file "example6.db"; + }; }; view seven { - match-clients { geoip city "Ketchikan"; }; - zone "example" { - type master; - file "example7.db"; - }; + match-clients { geoip city "Ketchikan"; }; + zone "example" { + type master; + file "example7.db"; + }; }; view none { - match-clients { any; }; - zone "example" { - type master; - file "example.db.in"; - }; + match-clients { any; }; + zone "example" { + type master; + file "example.db.in"; + }; }; diff --git a/bin/tests/system/geoip/ns2/named7.conf b/bin/tests/system/geoip/ns2/named7.conf index 3ffafb7554..b404880836 100644 --- a/bin/tests/system/geoip/ns2/named7.conf +++ b/bin/tests/system/geoip/ns2/named7.conf @@ -40,65 +40,65 @@ controls { }; view one { - match-clients { geoip isp "One Systems, Inc."; }; - zone "example" { - type master; - file "example1.db"; - }; + match-clients { geoip isp "One Systems, Inc."; }; + zone "example" { + type master; + file "example1.db"; + }; }; view two { - match-clients { geoip isp "Two Technology Ltd."; }; - zone "example" { - type master; - file "example2.db"; - }; + match-clients { geoip isp "Two Technology Ltd."; }; + zone "example" { + type master; + file "example2.db"; + }; }; view three { - match-clients { geoip isp "Three Network Labs"; }; - zone "example" { - type master; - file "example3.db"; - }; + match-clients { geoip isp "Three Network Labs"; }; + zone "example" { + type master; + file "example3.db"; + }; }; view four { - match-clients { geoip isp "Four University"; }; - zone "example" { - type master; - file "example4.db"; - }; + match-clients { geoip isp "Four University"; }; + zone "example" { + type master; + file "example4.db"; + }; }; view five { - match-clients { geoip isp "Five Telecom"; }; - zone "example" { - type master; - file "example5.db"; - }; + match-clients { geoip isp "Five Telecom"; }; + zone "example" { + type master; + file "example5.db"; + }; }; view six { - match-clients { geoip isp "Six Company"; }; - zone "example" { - type master; - file "example6.db"; - }; + match-clients { geoip isp "Six Company"; }; + zone "example" { + type master; + file "example6.db"; + }; }; view seven { - match-clients { geoip isp "Seven Communications"; }; - zone "example" { - type master; - file "example7.db"; - }; + match-clients { geoip isp "Seven Communications"; }; + zone "example" { + type master; + file "example7.db"; + }; }; view none { - match-clients { any; }; - zone "example" { - type master; - file "example.db.in"; - }; + match-clients { any; }; + zone "example" { + type master; + file "example.db.in"; + }; }; diff --git a/bin/tests/system/geoip/ns2/named8.conf b/bin/tests/system/geoip/ns2/named8.conf index 3eee0cbe94..5f90f98616 100644 --- a/bin/tests/system/geoip/ns2/named8.conf +++ b/bin/tests/system/geoip/ns2/named8.conf @@ -40,65 +40,65 @@ controls { }; view one { - match-clients { geoip org "One Systems, Inc."; }; - zone "example" { - type master; - file "example1.db"; - }; + match-clients { geoip org "One Systems, Inc."; }; + zone "example" { + type master; + file "example1.db"; + }; }; view two { - match-clients { geoip org "Two Technology Ltd."; }; - zone "example" { - type master; - file "example2.db"; - }; + match-clients { geoip org "Two Technology Ltd."; }; + zone "example" { + type master; + file "example2.db"; + }; }; view three { - match-clients { geoip org "Three Network Labs"; }; - zone "example" { - type master; - file "example3.db"; - }; + match-clients { geoip org "Three Network Labs"; }; + zone "example" { + type master; + file "example3.db"; + }; }; view four { - match-clients { geoip org "Four University"; }; - zone "example" { - type master; - file "example4.db"; - }; + match-clients { geoip org "Four University"; }; + zone "example" { + type master; + file "example4.db"; + }; }; view five { - match-clients { geoip org "Five Telecom"; }; - zone "example" { - type master; - file "example5.db"; - }; + match-clients { geoip org "Five Telecom"; }; + zone "example" { + type master; + file "example5.db"; + }; }; view six { - match-clients { geoip org "Six Company"; }; - zone "example" { - type master; - file "example6.db"; - }; + match-clients { geoip org "Six Company"; }; + zone "example" { + type master; + file "example6.db"; + }; }; view seven { - match-clients { geoip org "Seven Communications"; }; - zone "example" { - type master; - file "example7.db"; - }; + match-clients { geoip org "Seven Communications"; }; + zone "example" { + type master; + file "example7.db"; + }; }; view none { - match-clients { any; }; - zone "example" { - type master; - file "example.db.in"; - }; + match-clients { any; }; + zone "example" { + type master; + file "example.db.in"; + }; }; diff --git a/bin/tests/system/geoip/ns2/named9.conf b/bin/tests/system/geoip/ns2/named9.conf index 9d4ad4f9aa..1fb2184cdb 100644 --- a/bin/tests/system/geoip/ns2/named9.conf +++ b/bin/tests/system/geoip/ns2/named9.conf @@ -40,65 +40,65 @@ controls { }; view one { - match-clients { geoip asnum "AS100001 One Systems, Inc."; }; - zone "example" { - type master; - file "example1.db"; - }; + match-clients { geoip asnum "AS100001 One Systems, Inc."; }; + zone "example" { + type master; + file "example1.db"; + }; }; view two { - match-clients { geoip asnum "AS100002 Two Technology Ltd."; }; - zone "example" { - type master; - file "example2.db"; - }; + match-clients { geoip asnum "AS100002 Two Technology Ltd."; }; + zone "example" { + type master; + file "example2.db"; + }; }; view three { - match-clients { geoip asnum "AS100003 Three Network Labs"; }; - zone "example" { - type master; - file "example3.db"; - }; + match-clients { geoip asnum "AS100003 Three Network Labs"; }; + zone "example" { + type master; + file "example3.db"; + }; }; view four { - match-clients { geoip asnum "AS100004 Four University"; }; - zone "example" { - type master; - file "example4.db"; - }; + match-clients { geoip asnum "AS100004 Four University"; }; + zone "example" { + type master; + file "example4.db"; + }; }; view five { - match-clients { geoip asnum "AS100005 Five Telecom"; }; - zone "example" { - type master; - file "example5.db"; - }; + match-clients { geoip asnum "AS100005 Five Telecom"; }; + zone "example" { + type master; + file "example5.db"; + }; }; view six { - match-clients { geoip asnum "AS100006 Six Company"; }; - zone "example" { - type master; - file "example6.db"; - }; + match-clients { geoip asnum "AS100006 Six Company"; }; + zone "example" { + type master; + file "example6.db"; + }; }; view seven { - match-clients { geoip asnum "AS100007 Seven Communications"; }; - zone "example" { - type master; - file "example7.db"; - }; + match-clients { geoip asnum "AS100007 Seven Communications"; }; + zone "example" { + type master; + file "example7.db"; + }; }; view none { - match-clients { any; }; - zone "example" { - type master; - file "example.db.in"; - }; + match-clients { any; }; + zone "example" { + type master; + file "example.db.in"; + }; }; diff --git a/bin/tests/system/ixfr/ns3/named.conf b/bin/tests/system/ixfr/ns3/named.conf index 715800d715..9593970229 100644 --- a/bin/tests/system/ixfr/ns3/named.conf +++ b/bin/tests/system/ixfr/ns3/named.conf @@ -17,37 +17,37 @@ /* $Id: named.conf,v 1.3 2011/09/07 23:46:27 tbox Exp $ */ options { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; + query-source address 10.53.0.3; + notify-source 10.53.0.3; + transfer-source 10.53.0.3; allow-transfer { any; }; - port 5300; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; - recursion no; - notify yes; + port 5300; + pid-file "named.pid"; + listen-on { 10.53.0.3; }; + listen-on-v6 { none; }; + recursion no; + notify yes; }; key rndc_key { - secret "1234abcd8765"; - algorithm hmac-sha256; + secret "1234abcd8765"; + algorithm hmac-sha256; }; controls { - inet 10.53.0.3 port 9953 allow { any; } keys { rndc_key; }; + inet 10.53.0.3 port 9953 allow { any; } keys { rndc_key; }; }; view "primary" { - ixfr-from-differences yes; + ixfr-from-differences yes; request-ixfr yes; - zone "test" IN { - type master; - file "mytest.db"; - }; + zone "test" IN { + type master; + file "mytest.db"; + }; zone "sub.test" IN { - type master; - file "subtest.db"; - request-ixfr no; - }; + type master; + file "subtest.db"; + request-ixfr no; + }; }; diff --git a/bin/tests/system/ixfr/ns4/named.conf b/bin/tests/system/ixfr/ns4/named.conf index e0d60570b3..4c3823a13d 100644 --- a/bin/tests/system/ixfr/ns4/named.conf +++ b/bin/tests/system/ixfr/ns4/named.conf @@ -17,38 +17,38 @@ /* $Id: named.conf,v 1.3 2011/09/07 23:46:28 tbox Exp $ */ options { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port 5300; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; - recursion no; - notify yes; + query-source address 10.53.0.4; + notify-source 10.53.0.4; + transfer-source 10.53.0.4; + port 5300; + pid-file "named.pid"; + listen-on { 10.53.0.4; }; + listen-on-v6 { none; }; + recursion no; + notify yes; }; key rndc_key { - secret "1234abcd8765"; - algorithm hmac-sha256; + secret "1234abcd8765"; + algorithm hmac-sha256; }; controls { - inet 10.53.0.4 port 9953 allow { any; } keys { rndc_key; }; + inet 10.53.0.4 port 9953 allow { any; } keys { rndc_key; }; }; view "primary" { - ixfr-from-differences yes; + ixfr-from-differences yes; request-ixfr yes; - zone "test" IN { - type slave; - file "mytest.db"; - masters { 10.53.0.3; }; - }; - zone "sub.test" IN { - type slave; - file "subtest.db"; - request-ixfr no; - masters { 10.53.0.3; }; - }; + zone "test" IN { + type slave; + file "mytest.db"; + masters { 10.53.0.3; }; + }; + zone "sub.test" IN { + type slave; + file "subtest.db"; + request-ixfr no; + masters { 10.53.0.3; }; + }; }; diff --git a/bin/tests/system/logfileconfig/ns1/named.dirconf b/bin/tests/system/logfileconfig/ns1/named.dirconf index 137ac00d9b..bbee9a0acd 100644 --- a/bin/tests/system/logfileconfig/ns1/named.dirconf +++ b/bin/tests/system/logfileconfig/ns1/named.dirconf @@ -17,37 +17,37 @@ /* $Id: named.dirconf,v 1.2 2011/03/04 14:43:57 smann Exp $ */ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port 5300; - pid-file "named.pid"; - listen-on port 5300 { - 10.53.0.1; - }; - listen-on-v6 { none; }; + query-source address 10.53.0.1; + notify-source 10.53.0.1; + transfer-source 10.53.0.1; + port 5300; + pid-file "named.pid"; + listen-on port 5300 { + 10.53.0.1; + }; + listen-on-v6 { none; }; recursion no; notify yes; }; logging { - channel default_log { - file "named_dir"; - print-time yes; - }; - category default { default_log; default_debug; }; - category lame-servers { null; }; + channel default_log { + file "named_dir"; + print-time yes; + }; + category default { default_log; default_debug; }; + category lame-servers { null; }; }; controls { inet 127.0.0.1 port 9593 allow { - 127.0.0.1/32; ::1/128; } - keys { "rndc-key"; }; + 127.0.0.1/32; ::1/128; } + keys { "rndc-key"; }; }; key "rndc-key" { - algorithm hmac-sha256; - secret "Am9vCg=="; + algorithm hmac-sha256; + secret "Am9vCg=="; }; zone "." { diff --git a/bin/tests/system/logfileconfig/ns1/named.pipeconf b/bin/tests/system/logfileconfig/ns1/named.pipeconf index eeec461449..ba725edb77 100644 --- a/bin/tests/system/logfileconfig/ns1/named.pipeconf +++ b/bin/tests/system/logfileconfig/ns1/named.pipeconf @@ -17,37 +17,37 @@ /* $Id: named.pipeconf,v 1.2 2011/03/04 14:43:57 smann Exp $ */ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port 5300; - pid-file "named.pid"; - listen-on port 5300 { - 10.53.0.1; - }; - listen-on-v6 { none; }; + query-source address 10.53.0.1; + notify-source 10.53.0.1; + transfer-source 10.53.0.1; + port 5300; + pid-file "named.pid"; + listen-on port 5300 { + 10.53.0.1; + }; + listen-on-v6 { none; }; recursion no; notify yes; }; logging { - channel default_log { - file "named_pipe"; - print-time yes; - }; - category default { default_log; default_debug; }; - category lame-servers { null; }; + channel default_log { + file "named_pipe"; + print-time yes; + }; + category default { default_log; default_debug; }; + category lame-servers { null; }; }; controls { inet 127.0.0.1 port 9593 allow { - 127.0.0.1/32; ::1/128; } - keys { "rndc-key"; }; + 127.0.0.1/32; ::1/128; } + keys { "rndc-key"; }; }; key "rndc-key" { - algorithm hmac-sha256; - secret "Am9vCg=="; + algorithm hmac-sha256; + secret "Am9vCg=="; }; zone "." { diff --git a/bin/tests/system/logfileconfig/ns1/named.plain b/bin/tests/system/logfileconfig/ns1/named.plain index c99f3beac5..05caaa6715 100644 --- a/bin/tests/system/logfileconfig/ns1/named.plain +++ b/bin/tests/system/logfileconfig/ns1/named.plain @@ -17,37 +17,37 @@ /* $Id: named.plain,v 1.2 2011/03/04 14:43:57 smann Exp $ */ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port 5300; - pid-file "named.pid"; - listen-on port 5300 { - 10.53.0.1; - }; - listen-on-v6 { none; }; + query-source address 10.53.0.1; + notify-source 10.53.0.1; + transfer-source 10.53.0.1; + port 5300; + pid-file "named.pid"; + listen-on port 5300 { + 10.53.0.1; + }; + listen-on-v6 { none; }; recursion no; notify yes; }; logging { - channel default_log { - file "named_log"; - print-time yes; - }; - category default { default_log; default_debug; }; - category lame-servers { null; }; + channel default_log { + file "named_log"; + print-time yes; + }; + category default { default_log; default_debug; }; + category lame-servers { null; }; }; controls { inet 127.0.0.1 port 9593 allow { - 127.0.0.1/32; ::1/128; } - keys { "rndc-key"; }; + 127.0.0.1/32; ::1/128; } + keys { "rndc-key"; }; }; key "rndc-key" { - algorithm hmac-sha256; - secret "Am9vCg=="; + algorithm hmac-sha256; + secret "Am9vCg=="; }; diff --git a/bin/tests/system/logfileconfig/ns1/named.symconf b/bin/tests/system/logfileconfig/ns1/named.symconf index 4b63a07437..5182c30b37 100644 --- a/bin/tests/system/logfileconfig/ns1/named.symconf +++ b/bin/tests/system/logfileconfig/ns1/named.symconf @@ -17,37 +17,37 @@ /* $Id: named.symconf,v 1.2 2011/03/04 14:43:57 smann Exp $ */ options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port 5300; - pid-file "named.pid"; - listen-on port 5300 { - 10.53.0.1; - }; - listen-on-v6 { none; }; + query-source address 10.53.0.1; + notify-source 10.53.0.1; + transfer-source 10.53.0.1; + port 5300; + pid-file "named.pid"; + listen-on port 5300 { + 10.53.0.1; + }; + listen-on-v6 { none; }; recursion no; notify yes; }; logging { - channel default_log { - file "named_sym"; - print-time yes; - }; - category default { default_log; default_debug; }; - category lame-servers { null; }; + channel default_log { + file "named_sym"; + print-time yes; + }; + category default { default_log; default_debug; }; + category lame-servers { null; }; }; controls { inet 127.0.0.1 port 9593 allow { - 127.0.0.1/32; ::1/128; } - keys { "rndc-key"; }; + 127.0.0.1/32; ::1/128; } + keys { "rndc-key"; }; }; key "rndc-key" { - algorithm hmac-sha256; - secret "Am9vCg=="; + algorithm hmac-sha256; + secret "Am9vCg=="; }; zone "." { diff --git a/bin/tests/system/logfileconfig/ns1/rndc.conf b/bin/tests/system/logfileconfig/ns1/rndc.conf index 3b37264848..61fe409596 100644 --- a/bin/tests/system/logfileconfig/ns1/rndc.conf +++ b/bin/tests/system/logfileconfig/ns1/rndc.conf @@ -26,6 +26,6 @@ server localhost { }; key "rndc-key" { - algorithm hmac-sha256; - secret "Am9vCg=="; + algorithm hmac-sha256; + secret "Am9vCg=="; }; diff --git a/bin/tests/system/masterformat/ns1/named.conf b/bin/tests/system/masterformat/ns1/named.conf index 03d0e29698..02c4978ee1 100644 --- a/bin/tests/system/masterformat/ns1/named.conf +++ b/bin/tests/system/masterformat/ns1/named.conf @@ -23,7 +23,7 @@ controls { /* empty */ }; options { pid-file "named.pid"; listen-on port 5300 { 10.53.0.1; }; - port 5300; + port 5300; listen-on-v6 { none; }; recursion no; notify no; @@ -32,12 +32,12 @@ options { }; key rndc_key { - secret "1234abcd8765"; - algorithm hmac-sha256; + secret "1234abcd8765"; + algorithm hmac-sha256; }; controls { - inet 10.53.0.1 port 9953 allow { any; } keys { rndc_key; }; + inet 10.53.0.1 port 9953 allow { any; } keys { rndc_key; }; }; zone "example" { @@ -53,35 +53,35 @@ zone "compat-example" { }; zone "transfer1" { - type master; - file "example.db"; - allow-transfer { any; }; + type master; + file "example.db"; + allow-transfer { any; }; }; zone "transfer2" { - type master; - file "example.db"; - allow-transfer { any; }; + type master; + file "example.db"; + allow-transfer { any; }; }; zone "transfer3" { - type master; - file "example.db"; - allow-transfer { any; }; + type master; + file "example.db"; + allow-transfer { any; }; }; zone "large" { - type master; - file "large.db.raw"; + type master; + file "large.db.raw"; masterfile-format raw; - allow-transfer { any; }; + allow-transfer { any; }; }; zone "signed" { - type master; - file "signed.db.map"; - masterfile-format map; - allow-transfer { any; }; - update-policy local; - auto-dnssec maintain; + type master; + file "signed.db.map"; + masterfile-format map; + allow-transfer { any; }; + update-policy local; + auto-dnssec maintain; }; diff --git a/bin/tests/system/masterformat/ns3/named.conf b/bin/tests/system/masterformat/ns3/named.conf index f3005ec576..d5aebba877 100644 --- a/bin/tests/system/masterformat/ns3/named.conf +++ b/bin/tests/system/masterformat/ns3/named.conf @@ -23,7 +23,7 @@ controls { /* empty */ }; options { pid-file "named.pid"; listen-on port 5300 { 10.53.0.3; }; - port 5300; + port 5300; listen-on-v6 { none; }; recursion no; notify no; @@ -31,12 +31,12 @@ options { }; key rndc_key { - secret "1234abcd8765"; - algorithm hmac-sha256; + secret "1234abcd8765"; + algorithm hmac-sha256; }; controls { - inet 10.53.0.3 port 9953 allow { any; } keys { rndc_key; }; + inet 10.53.0.3 port 9953 allow { any; } keys { rndc_key; }; }; zone "example" { diff --git a/bin/tests/system/nsupdate/ns1/named.conf b/bin/tests/system/nsupdate/ns1/named.conf index 0fd6148799..a2bcded8a5 100644 --- a/bin/tests/system/nsupdate/ns1/named.conf +++ b/bin/tests/system/nsupdate/ns1/named.conf @@ -42,8 +42,8 @@ controls { }; key altkey { - algorithm hmac-md5; - secret "1234abcd8765"; + algorithm hmac-md5; + secret "1234abcd8765"; }; include "ddns.key"; @@ -68,8 +68,8 @@ zone "other.nil" { }; masters othermasters { - 10.53.0.2 port 5300; - 10.53.0.2 port 5300 key altkey; + 10.53.0.2 port 5300; + 10.53.0.2 port 5300 key altkey; }; zone "update.nil" { @@ -98,14 +98,14 @@ include "sha384.key"; include "sha512.key"; zone "keytests.nil" { - type master; - file "keytests.db"; - update-policy { - grant md5-key name md5.keytests.nil. ANY; - grant sha1-key name sha1.keytests.nil. ANY; - grant sha224-key name sha224.keytests.nil. ANY; - grant sha256-key name sha256.keytests.nil. ANY; - grant sha384-key name sha384.keytests.nil. ANY; - grant sha512-key name sha512.keytests.nil. ANY; - }; + type master; + file "keytests.db"; + update-policy { + grant md5-key name md5.keytests.nil. ANY; + grant sha1-key name sha1.keytests.nil. ANY; + grant sha224-key name sha224.keytests.nil. ANY; + grant sha256-key name sha256.keytests.nil. ANY; + grant sha384-key name sha384.keytests.nil. ANY; + grant sha512-key name sha512.keytests.nil. ANY; + }; }; diff --git a/bin/tests/system/nsupdate/ns2/named.conf b/bin/tests/system/nsupdate/ns2/named.conf index 6cee64ae8c..8622cb2b5b 100644 --- a/bin/tests/system/nsupdate/ns2/named.conf +++ b/bin/tests/system/nsupdate/ns2/named.conf @@ -33,35 +33,35 @@ options { }; key altkey { - algorithm hmac-md5; - secret "1234abcd8765"; + algorithm hmac-md5; + secret "1234abcd8765"; }; view alternate { - match-clients { key altkey; }; + match-clients { key altkey; }; - zone "update.nil" { - type slave; - masters { 10.53.0.1; }; - file "update.alt.bk"; - allow-transfer { any; }; - }; + zone "update.nil" { + type slave; + masters { 10.53.0.1; }; + file "update.alt.bk"; + allow-transfer { any; }; + }; }; view primary { - match-clients { any; }; + match-clients { any; }; - zone "example.nil" { - type slave; - masters { 10.53.0.1; }; - file "example.bk"; - allow-transfer { any; }; - }; + zone "example.nil" { + type slave; + masters { 10.53.0.1; }; + file "example.bk"; + allow-transfer { any; }; + }; - zone "update.nil" { - type slave; - masters { 10.53.0.1; }; - file "update.bk"; - allow-transfer { any; }; - }; + zone "update.nil" { + type slave; + masters { 10.53.0.1; }; + file "update.bk"; + allow-transfer { any; }; + }; }; diff --git a/bin/tests/system/redirect/ns2/named.conf b/bin/tests/system/redirect/ns2/named.conf index 6f62644516..0e2fed17e3 100644 --- a/bin/tests/system/redirect/ns2/named.conf +++ b/bin/tests/system/redirect/ns2/named.conf @@ -38,12 +38,12 @@ options { }; key rndc_key { - secret "1234abcd8765"; - algorithm hmac-sha256; + secret "1234abcd8765"; + algorithm hmac-sha256; }; controls { - inet 10.53.0.2 port 9953 allow { any; } keys { rndc_key; }; + inet 10.53.0.2 port 9953 allow { any; } keys { rndc_key; }; }; zone "." { diff --git a/bin/tests/system/resolver/ns4/named.conf b/bin/tests/system/resolver/ns4/named.conf index c2275d8e67..197451e219 100644 --- a/bin/tests/system/resolver/ns4/named.conf +++ b/bin/tests/system/resolver/ns4/named.conf @@ -58,10 +58,10 @@ zone "broken" { }; key rndc_key { - secret "1234abcd8765"; - algorithm hmac-sha256; + secret "1234abcd8765"; + algorithm hmac-sha256; }; controls { - inet 10.53.0.4 port 9953 allow { any; } keys { rndc_key; }; + inet 10.53.0.4 port 9953 allow { any; } keys { rndc_key; }; }; diff --git a/bin/tests/system/rndc/ns2/named.conf b/bin/tests/system/rndc/ns2/named.conf index e18b760f49..e09e143291 100644 --- a/bin/tests/system/rndc/ns2/named.conf +++ b/bin/tests/system/rndc/ns2/named.conf @@ -21,10 +21,10 @@ controls { /* empty */ }; options { port 5300; pid-file "named.pid"; - session-keyfile "session.key"; + session-keyfile "session.key"; listen-on { 10.53.0.2; }; listen-on-v6 { none; }; - recursion no; + recursion no; }; key rndc_key { @@ -49,14 +49,14 @@ zone "." { zone "nil" { type master; - update-policy local; + update-policy local; file "nil.db"; - ixfr-from-differences yes; + ixfr-from-differences yes; }; zone "other" { type master; - update-policy local; + update-policy local; file "other.db"; }; diff --git a/bin/tests/system/rndc/ns2/secondkey.conf b/bin/tests/system/rndc/ns2/secondkey.conf index 4f819500d8..2ebb8e84e5 100644 --- a/bin/tests/system/rndc/ns2/secondkey.conf +++ b/bin/tests/system/rndc/ns2/secondkey.conf @@ -17,10 +17,10 @@ /* $Id: rndc.conf,v 1.5 2007/06/19 23:47:01 tbox Exp $ */ options { - default-key "secondkey"; + default-key "secondkey"; }; key secondkey { - secret "abcd1234abcd8765"; - algorithm hmac-sha256; + secret "abcd1234abcd8765"; + algorithm hmac-sha256; }; diff --git a/bin/tests/system/rndc/ns3/named.conf b/bin/tests/system/rndc/ns3/named.conf index b8e07805ef..d2fcc43c9e 100644 --- a/bin/tests/system/rndc/ns3/named.conf +++ b/bin/tests/system/rndc/ns3/named.conf @@ -23,7 +23,7 @@ options { pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; - recursion no; + recursion no; }; key rndc_key { diff --git a/bin/tests/system/rndc/ns4/named.conf.in b/bin/tests/system/rndc/ns4/named.conf.in index 6d1f09d6f5..bf66a8878c 100644 --- a/bin/tests/system/rndc/ns4/named.conf.in +++ b/bin/tests/system/rndc/ns4/named.conf.in @@ -23,6 +23,6 @@ options { pid-file "named.pid"; listen-on { 10.53.0.4; }; listen-on-v6 { none; }; - recursion no; + recursion no; }; diff --git a/bin/tests/system/rpz/ns2/named.conf b/bin/tests/system/rpz/ns2/named.conf index 2b3d65a7b8..65013bc333 100644 --- a/bin/tests/system/rpz/ns2/named.conf +++ b/bin/tests/system/rpz/ns2/named.conf @@ -33,11 +33,11 @@ options { }; key rndc_key { - secret "1234abcd8765"; - algorithm hmac-sha256; + secret "1234abcd8765"; + algorithm hmac-sha256; }; controls { - inet 10.53.0.2 port 9953 allow { any; } keys { rndc_key; }; + inet 10.53.0.2 port 9953 allow { any; } keys { rndc_key; }; }; include "../trusted.conf"; diff --git a/bin/tests/system/staticstub/ns3/named.conf.in b/bin/tests/system/staticstub/ns3/named.conf.in index c82f6cbb58..8c1c78b22b 100644 --- a/bin/tests/system/staticstub/ns3/named.conf.in +++ b/bin/tests/system/staticstub/ns3/named.conf.in @@ -31,12 +31,12 @@ # $Id: named.conf.in,v 1.4 2010/12/18 23:47:11 tbox Exp $ key rndc_key { - secret "1234abcd8765"; - algorithm hmac-sha256; + secret "1234abcd8765"; + algorithm hmac-sha256; }; controls { - inet 10.53.0.3 port 9953 allow { any; } keys { rndc_key; }; + inet 10.53.0.3 port 9953 allow { any; } keys { rndc_key; }; }; options { diff --git a/bin/tests/system/statistics/ns3/named.conf b/bin/tests/system/statistics/ns3/named.conf index f2b17403b3..23ad95d249 100644 --- a/bin/tests/system/statistics/ns3/named.conf +++ b/bin/tests/system/statistics/ns3/named.conf @@ -34,12 +34,12 @@ options { #statistics-channels { inet * port 8888 allow { any; }; }; key rndc_key { - secret "1234abcd8765"; - algorithm hmac-sha256; + secret "1234abcd8765"; + algorithm hmac-sha256; }; controls { - inet 10.53.0.3 port 9953 allow { any; } keys { rndc_key; }; + inet 10.53.0.3 port 9953 allow { any; } keys { rndc_key; }; }; zone "." { @@ -49,7 +49,7 @@ zone "." { zone "example" { type master; - allow-update { any; }; + allow-update { any; }; file "internal.db"; }; diff --git a/bin/tests/system/stress/ns3/named.conf b/bin/tests/system/stress/ns3/named.conf index bf843256be..29224671ab 100644 --- a/bin/tests/system/stress/ns3/named.conf +++ b/bin/tests/system/stress/ns3/named.conf @@ -33,12 +33,12 @@ options { }; key rndc_key { - secret "1234abcd8765"; - algorithm hmac-sha256; + secret "1234abcd8765"; + algorithm hmac-sha256; }; controls { - inet 10.53.0.3 port 9953 allow { any; } keys { rndc_key; }; + inet 10.53.0.3 port 9953 allow { any; } keys { rndc_key; }; }; zone "." { diff --git a/bin/tests/system/tkey/ns1/named.conf.in b/bin/tests/system/tkey/ns1/named.conf.in index 819b72df91..087d8df528 100644 --- a/bin/tests/system/tkey/ns1/named.conf.in +++ b/bin/tests/system/tkey/ns1/named.conf.in @@ -35,12 +35,12 @@ options { }; key rndc_key { - secret "1234abcd8765"; - algorithm hmac-sha256; + secret "1234abcd8765"; + algorithm hmac-sha256; }; controls { - inet 10.53.0.1 port 9953 allow { any; } keys { rndc_key; }; + inet 10.53.0.1 port 9953 allow { any; } keys { rndc_key; }; }; key "tkeytest." { @@ -49,7 +49,7 @@ key "tkeytest." { }; zone example { - type master; - file "example.db"; - allow-query { key tkeytest.; none; }; + type master; + file "example.db"; + allow-query { key tkeytest.; none; }; }; diff --git a/bin/tests/system/views/ns3/named1.conf b/bin/tests/system/views/ns3/named1.conf index 35f29ce496..11a105e241 100644 --- a/bin/tests/system/views/ns3/named1.conf +++ b/bin/tests/system/views/ns3/named1.conf @@ -33,12 +33,12 @@ options { }; key rndc_key { - secret "1234abcd8765"; - algorithm hmac-sha256; + secret "1234abcd8765"; + algorithm hmac-sha256; }; controls { - inet 10.53.0.3 port 9953 allow { any; } keys { rndc_key; }; + inet 10.53.0.3 port 9953 allow { any; } keys { rndc_key; }; }; zone "." { @@ -48,7 +48,7 @@ zone "." { zone "example" { type master; - allow-update { any; }; + allow-update { any; }; file "internal.db"; }; diff --git a/bin/tests/system/views/ns3/named2.conf b/bin/tests/system/views/ns3/named2.conf index 6ebcc233bc..495bdc432e 100644 --- a/bin/tests/system/views/ns3/named2.conf +++ b/bin/tests/system/views/ns3/named2.conf @@ -33,12 +33,12 @@ options { }; key rndc_key { - secret "1234abcd8765"; - algorithm hmac-sha256; + secret "1234abcd8765"; + algorithm hmac-sha256; }; controls { - inet 10.53.0.3 port 11953 allow { any; } keys { rndc_key; }; + inet 10.53.0.3 port 11953 allow { any; } keys { rndc_key; }; }; zone "." { @@ -49,6 +49,6 @@ zone "." { zone "example" { type slave; masters { 10.53.0.2; }; - allow-update { any; }; + allow-update { any; }; file "internal.bk"; }; diff --git a/bin/tests/system/xfer/ns2/named.conf b/bin/tests/system/xfer/ns2/named.conf index 523672d221..03b06c2c6c 100644 --- a/bin/tests/system/xfer/ns2/named.conf +++ b/bin/tests/system/xfer/ns2/named.conf @@ -64,5 +64,5 @@ zone "slave" { type slave; file "slave.db"; masters { 10.53.0.1; }; - masterfile-format text; + masterfile-format text; }; diff --git a/bin/tests/system/xfer/ns3/named.conf b/bin/tests/system/xfer/ns3/named.conf index 2cd6de0f94..2671c9b0f6 100644 --- a/bin/tests/system/xfer/ns3/named.conf +++ b/bin/tests/system/xfer/ns3/named.conf @@ -33,17 +33,17 @@ options { }; key rndc_key { - secret "1234abcd8765"; - algorithm hmac-sha256; + secret "1234abcd8765"; + algorithm hmac-sha256; }; controls { - inet 10.53.0.3 port 9953 allow { any; } keys { rndc_key; }; + inet 10.53.0.3 port 9953 allow { any; } keys { rndc_key; }; }; key tsigzone. { - algorithm hmac-md5; - secret "1234abcd8765"; + algorithm hmac-md5; + secret "1234abcd8765"; }; zone "." { diff --git a/bin/tests/system/zonechecks/ns1/named.conf b/bin/tests/system/zonechecks/ns1/named.conf index 4c3da676f4..7be4cee879 100644 --- a/bin/tests/system/zonechecks/ns1/named.conf +++ b/bin/tests/system/zonechecks/ns1/named.conf @@ -35,19 +35,19 @@ options { }; key rndc_key { - secret "1234abcd8765"; - algorithm hmac-sha256; + secret "1234abcd8765"; + algorithm hmac-sha256; }; controls { - inet 10.53.0.1 port 9953 allow { any; } keys { rndc_key; }; + inet 10.53.0.1 port 9953 allow { any; } keys { rndc_key; }; }; zone "master.example" { type master; file "master.db"; - allow-update { any; }; - allow-transfer { any; }; - auto-dnssec maintain; + allow-update { any; }; + allow-transfer { any; }; + auto-dnssec maintain; }; diff --git a/bin/tests/system/zonechecks/ns2/named.conf b/bin/tests/system/zonechecks/ns2/named.conf index 0439ec7d69..50f225d848 100644 --- a/bin/tests/system/zonechecks/ns2/named.conf +++ b/bin/tests/system/zonechecks/ns2/named.conf @@ -35,17 +35,17 @@ options { }; key rndc_key { - secret "1234abcd8765"; - algorithm hmac-sha256; + secret "1234abcd8765"; + algorithm hmac-sha256; }; controls { - inet 10.53.0.2 port 9953 allow { any; } keys { rndc_key; }; + inet 10.53.0.2 port 9953 allow { any; } keys { rndc_key; }; }; zone "master.example" { type slave; - masters { 10.53.0.1; }; + masters { 10.53.0.1; }; file "slave.db"; }; diff --git a/util/update_copyrights b/util/update_copyrights index cba5e281d0..6a73291a50 100644 --- a/util/update_copyrights +++ b/util/update_copyrights @@ -464,7 +464,8 @@ foreach $file (keys %file_types) { print TARGET "\n"; } - if ($type eq "C" && $sysyears =~ /$this_year/) { + if (($type eq "C" || $type eq "CONF-C") && + $sysyears =~ /$this_year/) { my $body = ""; while () { # Process leading white space.