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/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/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/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 dc00ef672c..c67a83e26b 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-md5; + secret "1234abcd8765"; + algorithm hmac-md5; }; 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/nsupdate/ns1/named.conf b/bin/tests/system/nsupdate/ns1/named.conf index 3492b4cff4..d762b2b691 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/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/rndc/ns3/named.conf b/bin/tests/system/rndc/ns3/named.conf index 9feefac75e..0b2db3bea0 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/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/tkey/ns1/named.conf.in b/bin/tests/system/tkey/ns1/named.conf.in index 50600b784c..185c8fcb88 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-md5; + secret "1234abcd8765"; + algorithm hmac-md5; }; 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/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/util/update_copyrights b/util/update_copyrights index 6a73291a50..14faf3d79c 100644 --- a/util/update_copyrights +++ b/util/update_copyrights @@ -1,6 +1,6 @@ #!/usr/local/bin/perl -w # -# Copyright (C) 2004-2010, 2012 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004-2010, 2012, 2013 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 1998-2001 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any