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

whitspace

Browse Source
This commit is contained in:
Mark Andrews
2013-09-16 10:14:07 +10:00
parent d3be47a4a8
commit 2c089bf6d2
75 changed files with 823 additions and 822 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bin/rndc/rndc.conf
View File

@@ -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";
};

10
bin/tests/system/acl/ns2/named5.conf
View File

@@ -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; };
};

2
bin/tests/system/additional/ns1/named1.conf
View File

@@ -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" {

4
bin/tests/system/additional/ns1/named2.conf
View File

@@ -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" {

4
bin/tests/system/addzone/ns1/named.conf
View File

@@ -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 "." {

2
bin/tests/system/allow_query/ns2/named57.conf
View File

@@ -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";

14
bin/tests/system/autosign/ns1/named.conf
View File

@@ -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";

2
bin/tests/system/autosign/ns3/named.conf
View File

@@ -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;
};

24
bin/tests/system/checkconf/bad-dnssec.conf
View File

@@ -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;
};

8
bin/tests/system/checkconf/bad-inline-slave.conf
View File

@@ -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; };
};

12
bin/tests/system/checkconf/dlz-bad.conf
View File

@@ -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;
};

16
bin/tests/system/checkconf/inline-bad.conf
View File

@@ -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; };
};

18
bin/tests/system/checkconf/inline-good.conf
View File

@@ -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; };
};

16
bin/tests/system/checkconf/inline-no.conf
View File

@@ -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; };
};

6
bin/tests/system/checkconf/range.conf
View File

@@ -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";
};

6
bin/tests/system/common/controls.conf
View File

@@ -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; };
};

6
bin/tests/system/common/rndc.conf
View File

@@ -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";
};

4
bin/tests/system/common/rndc.key
View File

@@ -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;
};

6
bin/tests/system/database/ns1/named.conf1
View File

@@ -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 {

6
bin/tests/system/database/ns1/named.conf2
View File

@@ -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 {

2
bin/tests/system/dlv/ns5/named.conf
View File

@@ -25,7 +25,7 @@
* key "cc64b3d1db63fc88d7cb5d2f9f57d258" {
* algorithm hmac-sha256;
* secret "34f88008d07deabbe65bd01f1d233d47";
* };
* };
*
* server "10.53.0.5" {
* key cc64b3d1db63fc88d7cb5d2f9f57d258;

4
bin/tests/system/dlv/ns5/rndc.conf
View File

@@ -19,8 +19,8 @@
key "cc64b3d1db63fc88d7cb5d2f9f57d258" {
algorithm hmac-sha256;
secret "34f88008d07deabbe65bd01f1d233d47";
};
};
options {
default-server 10.53.0.5;
default-port 5353;

8
bin/tests/system/dlvauto/ns2/named.conf
View File

@@ -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; };
};

12
bin/tests/system/dlzexternal/ns1/named.conf.in
View File

@@ -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;
};

26
bin/tests/system/dns64/ns2/named.conf
View File

@@ -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 "." {

20
bin/tests/system/dnssec/ns3/named.conf
View File

@@ -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" {

6
bin/tests/system/dnssec/ns3/siginterval1.conf
View File

@@ -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";
};

6
bin/tests/system/dnssec/ns3/siginterval2.conf
View File

@@ -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";
};

18
bin/tests/system/dnssec/ns4/named1.conf
View File

@@ -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 "." {

10
bin/tests/system/dnssec/ns4/named2.conf
View File

@@ -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 "." {

10
bin/tests/system/dnssec/ns4/named3.conf
View File

@@ -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 "." {

4
bin/tests/system/filter-aaaa/ns2/named1.conf
View File

@@ -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 {

2
bin/tests/system/filter-aaaa/ns2/named2.conf
View File

@@ -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; };
};

4
bin/tests/system/filter-aaaa/ns3/named1.conf
View File

@@ -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 {

2
bin/tests/system/filter-aaaa/ns3/named2.conf
View File

@@ -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; };
};

80
bin/tests/system/geoip/ns2/named1.conf
View File

@@ -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";
};
};

80
bin/tests/system/geoip/ns2/named10.conf
View File

@@ -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";
};
};

50
bin/tests/system/geoip/ns2/named11.conf
View File

@@ -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";
};
};

80
bin/tests/system/geoip/ns2/named2.conf
View File

@@ -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";
};
};

80
bin/tests/system/geoip/ns2/named3.conf
View File

@@ -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";
};
};

70
bin/tests/system/geoip/ns2/named4.conf
View File

@@ -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";
};
};

80
bin/tests/system/geoip/ns2/named5.conf
View File

@@ -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";
};
};

80
bin/tests/system/geoip/ns2/named6.conf
View File

@@ -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";
};
};

80
bin/tests/system/geoip/ns2/named7.conf
View File

@@ -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";
};
};

80
bin/tests/system/geoip/ns2/named8.conf
View File

@@ -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";
};
};

80
bin/tests/system/geoip/ns2/named9.conf
View File

@@ -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";
};
};

42
bin/tests/system/ixfr/ns3/named.conf
View File

@@ -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;
};
};

48
bin/tests/system/ixfr/ns4/named.conf
View File

@@ -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; };
};
};

38
bin/tests/system/logfileconfig/ns1/named.dirconf
View File

@@ -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 "." {

38
bin/tests/system/logfileconfig/ns1/named.pipeconf
View File

@@ -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 "." {

38
bin/tests/system/logfileconfig/ns1/named.plain
View File

@@ -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==";
};

38
bin/tests/system/logfileconfig/ns1/named.symconf
View File

@@ -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 "." {

4
bin/tests/system/logfileconfig/ns1/rndc.conf
View File

@@ -26,6 +26,6 @@ server localhost {
};
key "rndc-key" {
algorithm hmac-sha256;
secret "Am9vCg==";
algorithm hmac-sha256;
secret "Am9vCg==";
};

44
bin/tests/system/masterformat/ns1/named.conf
View File

@@ -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;
};

8
bin/tests/system/masterformat/ns3/named.conf
View File

@@ -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" {

28
bin/tests/system/nsupdate/ns1/named.conf
View File

@@ -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;
};
};

44
bin/tests/system/nsupdate/ns2/named.conf
View File

@@ -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; };
};
};

6
bin/tests/system/redirect/ns2/named.conf
View File

@@ -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 "." {

6
bin/tests/system/resolver/ns4/named.conf
View File

@@ -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; };
};

10
bin/tests/system/rndc/ns2/named.conf
View File

@@ -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";
};

6
bin/tests/system/rndc/ns2/secondkey.conf
View File

@@ -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;
};

2
bin/tests/system/rndc/ns3/named.conf
View File

@@ -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 {

2
bin/tests/system/rndc/ns4/named.conf.in
View File

@@ -23,6 +23,6 @@ options {
pid-file "named.pid";
listen-on { 10.53.0.4; };
listen-on-v6 { none; };
recursion no;
recursion no;
};

6
bin/tests/system/rpz/ns2/named.conf
View File

@@ -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";

6
bin/tests/system/staticstub/ns3/named.conf.in
View File

@@ -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 {

8
bin/tests/system/statistics/ns3/named.conf
View File

@@ -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";
};

6
bin/tests/system/stress/ns3/named.conf
View File

@@ -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 "." {

12
bin/tests/system/tkey/ns1/named.conf.in
View File

@@ -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; };
};

8
bin/tests/system/views/ns3/named1.conf
View File

@@ -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";
};

8
bin/tests/system/views/ns3/named2.conf
View File

@@ -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";
};

2
bin/tests/system/xfer/ns2/named.conf
View File

@@ -64,5 +64,5 @@ zone "slave" {
type slave;
file "slave.db";
masters { 10.53.0.1; };
masterfile-format text;
masterfile-format text;
};

10
bin/tests/system/xfer/ns3/named.conf
View File

@@ -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 "." {

12
bin/tests/system/zonechecks/ns1/named.conf
View File

@@ -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;
};

8
bin/tests/system/zonechecks/ns2/named.conf
View File

@@ -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";
};

3
util/update_copyrights
View File

@@ -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 (<SOURCE>) {
# Process leading white space.