Commit 2c089bf6 authored by Mark Andrews's avatar Mark Andrews

whitspace

parent d3be47a4
......@@ -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";
};
......@@ -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; };
};
......@@ -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" {
......
......@@ -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" {
......
......@@ -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 "." {
......
......@@ -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";
......
......@@ -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";
......@@ -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;
};
......
......@@ -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;
};
......@@ -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
......@@ -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;
};
......@@ -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,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; };
};
......@@ -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; };
};
......@@ -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";
};
......@@ -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; };
};
......@@ -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";
};
......@@ -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;
};
......@@ -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 {
......
......@@ -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 {
......
......@@ -25,7 +25,7 @@
* key "cc64b3d1db63fc88d7cb5d2f9f57d258" {
* algorithm hmac-sha256;
* secret "34f88008d07deabbe65bd01f1d233d47";
* };
* };
*
* server "10.53.0.5" {
* key cc64b3d1db63fc88d7cb5d2f9f57d258;
......
......@@ -19,8 +19,8 @@
key "cc64b3d1db63fc88d7cb5d2f9f57d258" {
algorithm hmac-sha256;
secret "34f88008d07deabbe65bd01f1d233d47";
};
};
options {
default-server 10.53.0.5;
default-port 5353;
......
......@@ -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; };
};
......@@ -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;
};
......@@ -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 "." {
......
......@@ -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" {
......
......@@ -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";
};
......@@ -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";
};
......@@ -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; };