upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-02-27 12:02:10 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '1948-primaries-synonym-v9_16' into 'v9_16'

Browse source 
[v9_16] Resolve "add synonym for "masters""

See merge request isc-projects/bind9!4554
This commit is contained in:
Michał Kępień 2021-01-12 14:24:06 +00:00
commit b47ee8faea
370 changed files with 2119 additions and 1807 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CHANGES
View file

@ -2,6 +2,13 @@
of the DNSKEY signature validity. This is now fixed.
[GL #2383]
5456. [func] Added "primaries" as a synonym for "masters" in
named.conf, and "primary-only" as a synonym for
"master-only" in the parameters to "notify", to bring
terminology up-to-date with RFC 8499. [GL #1948]
--- 9.16.11 released ---
5559. [bug] The --with-maxminddb=PATH form of the build-time option
enabling support for libmaxminddb was not working
correctly. This has been fixed. [GL #2366]

10
bin/check/named-checkconf.c
View file

@ -184,7 +184,7 @@ configure_zone(const char *vclass, const char *view, const cfg_obj_t *zconfig,
const char *zname;
const char *zfile = NULL;
const cfg_obj_t *maps[4];
const cfg_obj_t *mastersobj = NULL;
const cfg_obj_t *primariesobj = NULL;
const cfg_obj_t *inviewobj = NULL;
const cfg_obj_t *zoptions = NULL;
const cfg_obj_t *classobj = NULL;
@ -278,8 +278,12 @@ configure_zone(const char *vclass, const char *view, const cfg_obj_t *zconfig,
* Is the redirect zone configured as a slave?
*/
if (strcasecmp(cfg_obj_asstring(typeobj), "redirect") == 0) {
cfg_map_get(zoptions, "masters", &mastersobj);
if (mastersobj != NULL) {
cfg_map_get(zoptions, "primaries", &primariesobj);
if (primariesobj == NULL) {
cfg_map_get(zoptions, "masters", &primariesobj);
}
if (primariesobj != NULL) {
return (ISC_R_SUCCESS);
}
}

54
bin/named/config.c
View file

@ -303,7 +303,7 @@ view \"_bind\" chaos {\n\
"# END MANAGED KEYS\n\
\n\
masters " DEFAULT_IANA_ROOT_ZONE_MASTERS " {\n\
primaries " DEFAULT_IANA_ROOT_ZONE_PRIMARIES " {\n\
2001:500:84::b; # b.root-servers.net\n\
2001:500:2f::f; # f.root-servers.net\n\
2001:7fd::1; # k.root-servers.net\n\
@ -567,33 +567,46 @@ named_config_putiplist(isc_mem_t *mctx, isc_sockaddr_t **addrsp,
}
}
isc_result_t
named_config_getmastersdef(const cfg_obj_t *cctx, const char *name,
const cfg_obj_t **ret) {
static isc_result_t
getprimariesdef(const cfg_obj_t *cctx, const char *list, const char *name,
const cfg_obj_t **ret) {
isc_result_t result;
const cfg_obj_t *masters = NULL;
const cfg_obj_t *obj = NULL;
const cfg_listelt_t *elt;
result = cfg_map_get(cctx, "masters", &masters);
REQUIRE(cctx != NULL);
REQUIRE(name != NULL);
REQUIRE(ret != NULL && *ret == NULL);
result = cfg_map_get(cctx, list, &obj);
if (result != ISC_R_SUCCESS) {
return (result);
}
for (elt = cfg_list_first(masters); elt != NULL;
elt = cfg_list_next(elt)) {
const cfg_obj_t *list;
const char *listname;
list = cfg_listelt_value(elt);
listname = cfg_obj_asstring(cfg_tuple_get(list, "name"));
if (strcasecmp(listname, name) == 0) {
*ret = list;
elt = cfg_list_first(obj);
while (elt != NULL) {
obj = cfg_listelt_value(elt);
if (strcasecmp(cfg_obj_asstring(cfg_tuple_get(obj, "name")),
name) == 0) {
*ret = obj;
return (ISC_R_SUCCESS);
}
elt = cfg_list_next(elt);
}
return (ISC_R_NOTFOUND);
}
isc_result_t
named_config_getprimariesdef(const cfg_obj_t *cctx, const char *name,
const cfg_obj_t **ret) {
isc_result_t result;
result = getprimariesdef(cctx, "primaries", name, ret);
if (result != ISC_R_SUCCESS) {
result = getprimariesdef(cctx, "masters", name, ret);
}
return (result);
}
isc_result_t
named_config_getipandkeylist(const cfg_obj_t *config, const cfg_obj_t *list,
isc_mem_t *mctx, dns_ipkeylist_t *ipkl) {
@ -679,7 +692,7 @@ resume:
isc_buffer_t b;
addr = cfg_tuple_get(cfg_listelt_value(element),
"masterselement");
"primarieselement");
key = cfg_tuple_get(cfg_listelt_value(element), "key");
if (!cfg_obj_issockaddr(addr)) {
@ -711,11 +724,12 @@ resume:
if (j < l) {
continue;
}
tresult = named_config_getmastersdef(config, listname,
&list);
list = NULL;
tresult = named_config_getprimariesdef(config, listname,
&list);
if (tresult == ISC_R_NOTFOUND) {
cfg_obj_log(addr, named_g_lctx, ISC_LOG_ERROR,
"masters \"%s\" not found",
"primaries \"%s\" not found",
listname);
result = tresult;

6
bin/named/include/named/config.h
View file

@ -21,7 +21,7 @@
#include <isccfg/cfg.h>
#define DEFAULT_IANA_ROOT_ZONE_MASTERS "_default_iana_root_zone_masters"
#define DEFAULT_IANA_ROOT_ZONE_PRIMARIES "_default_iana_root_zone_primaries"
isc_result_t
named_config_parsedefaults(cfg_parser_t *parser, cfg_obj_t **conf);
@ -59,8 +59,8 @@ named_config_putiplist(isc_mem_t *mctx, isc_sockaddr_t **addrsp,
isc_dscp_t **dscpsp, uint32_t count);
isc_result_t
named_config_getmastersdef(const cfg_obj_t *cctx, const char *name,
const cfg_obj_t **ret);
named_config_getprimariesdef(const cfg_obj_t *cctx, const char *name,
const cfg_obj_t **ret);
isc_result_t
named_config_getipandkeylist(const cfg_obj_t *config, const cfg_obj_t *list,

45
bin/named/named.conf.rst
View file

@ -145,8 +145,8 @@ MASTERS
::
masters string [ port integer ] [ dscp
integer ] { ( masters | ipv4_address [
port integer ] | ipv6_address [ port
integer ] { ( primaries | ipv4_address
[ port integer ] | ipv6_address [ port
integer ] ) [ key string ]; ... };
OPTIONS
@ -166,7 +166,7 @@ OPTIONS
allow-transfer { address_match_element; ... };
allow-update { address_match_element; ... };
allow-update-forwarding { address_match_element; ... };
also-notify [ port integer ] [ dscp integer ] { ( masters |
also-notify [ port integer ] [ dscp integer ] { ( primaries |
ipv4_address [ port integer ] | ipv6_address [ port
integer ] ) [ key string ]; ... };
alt-transfer-source ( ipv4_address | * ) [ port ( integer | * )
@ -184,7 +184,7 @@ OPTIONS
blackhole { address_match_element; ... };
cache-file quoted_string;
catalog-zones { zone string [ default-masters [ port integer ]
[ dscp integer ] { ( masters | ipv4_address [ port
[ dscp integer ] { ( primaries | ipv4_address [ port
integer ] | ipv6_address [ port integer ] ) [ key
string ]; ... } ] [ zone-directory quoted_string ] [
in-memory boolean ] [ min-update-interval duration ]; ... };
@ -325,7 +325,7 @@ OPTIONS
new-zones-directory quoted_string;
no-case-compress { address_match_element; ... };
nocookie-udp-size integer;
notify ( explicit | master-only | boolean );
notify ( explicit | master-only | primary-only | boolean );
notify-delay integer;
notify-rate integer;
notify-source ( ipv4_address | * ) [ port ( integer | * ) ] [
@ -459,6 +459,16 @@ PLUGIN
plugin ( query ) string [ { unspecified-text
} ];
PRIMARIES
^^^^^^^^^
::
primaries string [ port integer ] [ dscp
integer ] { ( primaries | ipv4_address
[ port integer ] | ipv6_address [ port
integer ] ) [ key string ]; ... };
SERVER
^^^^^^
@ -547,7 +557,7 @@ VIEW
allow-transfer { address_match_element; ... };
allow-update { address_match_element; ... };
allow-update-forwarding { address_match_element; ... };
also-notify [ port integer ] [ dscp integer ] { ( masters |
also-notify [ port integer ] [ dscp integer ] { ( primaries |
ipv4_address [ port integer ] | ipv6_address [ port
integer ] ) [ key string ]; ... };
alt-transfer-source ( ipv4_address | * ) [ port ( integer | * )
@ -559,7 +569,7 @@ VIEW
auto-dnssec ( allow | maintain | off );
cache-file quoted_string;
catalog-zones { zone string [ default-masters [ port integer ]
[ dscp integer ] { ( masters | ipv4_address [ port
[ dscp integer ] { ( primaries | ipv4_address [ port
integer ] | ipv6_address [ port integer ] ) [ key
string ]; ... } ] [ zone-directory quoted_string ] [
in-memory boolean ] [ min-update-interval duration ]; ... };
@ -679,7 +689,7 @@ VIEW
new-zones-directory quoted_string;
no-case-compress { address_match_element; ... };
nocookie-udp-size integer;
notify ( explicit | master-only | boolean );
notify ( explicit | master-only | primary-only | boolean );
notify-delay integer;
notify-source ( ipv4_address | * ) [ port ( integer | * ) ] [
dscp integer ];
@ -820,7 +830,7 @@ VIEW
allow-update { address_match_element; ... };
allow-update-forwarding { address_match_element; ... };
also-notify [ port integer ] [ dscp integer ] { (
masters | ipv4_address [ port integer ] |
primaries | ipv4_address [ port integer ] |
ipv6_address [ port integer ] ) [ key string ];
... };
alt-transfer-source ( ipv4_address | * ) [ port (
@ -860,7 +870,7 @@ VIEW
key-directory quoted_string;
masterfile-format ( map | raw | text );
masterfile-style ( full | relative );
masters [ port integer ] [ dscp integer ] { ( masters
masters [ port integer ] [ dscp integer ] { ( primaries
| ipv4_address [ port integer ] | ipv6_address [
port integer ] ) [ key string ]; ... };
max-journal-size ( default | unlimited | sizeval );
@ -875,13 +885,17 @@ VIEW
min-refresh-time integer;
min-retry-time integer;
multi-master boolean;
notify ( explicit | master-only | boolean );
notify ( explicit | master-only | primary-only | boolean );
notify-delay integer;
notify-source ( ipv4_address | * ) [ port ( integer | *
) ] [ dscp integer ];
notify-source-v6 ( ipv6_address | * ) [ port ( integer
| * ) ] [ dscp integer ];
notify-to-soa boolean;
primaries [ port integer ] [ dscp integer ] { (
primaries | ipv4_address [ port integer ] |
ipv6_address [ port integer ] ) [ key string ];
... };
request-expire boolean;
request-ixfr boolean;
serial-update-method ( date | increment | unixtime );
@ -924,7 +938,7 @@ ZONE
allow-transfer { address_match_element; ... };
allow-update { address_match_element; ... };
allow-update-forwarding { address_match_element; ... };
also-notify [ port integer ] [ dscp integer ] { ( masters |
also-notify [ port integer ] [ dscp integer ] { ( primaries |
ipv4_address [ port integer ] | ipv6_address [ port
integer ] ) [ key string ]; ... };
alt-transfer-source ( ipv4_address | * ) [ port ( integer | * )
@ -962,7 +976,7 @@ ZONE
key-directory quoted_string;
masterfile-format ( map | raw | text );
masterfile-style ( full | relative );
masters [ port integer ] [ dscp integer ] { ( masters |
masters [ port integer ] [ dscp integer ] { ( primaries |
ipv4_address [ port integer ] | ipv6_address [ port
integer ] ) [ key string ]; ... };
max-journal-size ( default | unlimited | sizeval );
@ -977,13 +991,16 @@ ZONE
min-refresh-time integer;
min-retry-time integer;
multi-master boolean;
notify ( explicit | master-only | boolean );
notify ( explicit | master-only | primary-only | boolean );
notify-delay integer;
notify-source ( ipv4_address | * ) [ port ( integer | * ) ] [
dscp integer ];
notify-source-v6 ( ipv6_address | * ) [ port ( integer | * ) ]
[ dscp integer ];
notify-to-soa boolean;
primaries [ port integer ] [ dscp integer ] { ( primaries |
ipv4_address [ port integer ] | ipv6_address [ port
integer ] ) [ key string ]; ... };
request-expire boolean;
request-ixfr boolean;
serial-update-method ( date | increment | unixtime );

8
bin/named/server.c
View file

@ -7293,10 +7293,10 @@ removed(dns_zone_t *zone, void *uap) {
switch (dns_zone_gettype(zone)) {
case dns_zone_master:
type = "master";
type = "primary";
break;
case dns_zone_slave:
type = "slave";
type = "secondary";
break;
case dns_zone_mirror:
type = "mirror";
@ -14914,10 +14914,10 @@ named_server_zonestatus(named_server_t *server, isc_lex_t *lex,
switch (zonetype) {
case dns_zone_master:
type = "master";
type = "primary";
break;
case dns_zone_slave:
type = "slave";
type = "secondary";
break;
case dns_zone_mirror:
type = "mirror";

32
bin/named/zoneconf.c
View file

@ -1218,8 +1218,8 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
/*
* Configure master functionality. This applies
* to primary masters (type "master") and slaves
* acting as masters (type "slave"), but not to stubs.
* to primary servers (type "primary") and secondaries
* acting as primaries (type "secondary"), but not to stubs.
*/
if (ztype != dns_zone_stub && ztype != dns_zone_staticstub &&
ztype != dns_zone_redirect)
@ -1249,10 +1249,12 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
notifytype = dns_notifytype_no;
}
} else {
const char *notifystr = cfg_obj_asstring(obj);
if (strcasecmp(notifystr, "explicit") == 0) {
const char *str = cfg_obj_asstring(obj);
if (strcasecmp(str, "explicit") == 0) {
notifytype = dns_notifytype_explicit;
} else if (strcasecmp(notifystr, "master-only") == 0) {
} else if (strcasecmp(str, "master-only") == 0 ||
strcasecmp(str, "primary-only") == 0)
{
notifytype = dns_notifytype_masteronly;
} else {
INSIST(0);
@ -1500,7 +1502,7 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
/*
* Configure update-related options. These apply to
* primary masters only.
* primary servers only.
*/
if (ztype == dns_zone_master) {
dns_acl_t *updateacl;
@ -1855,17 +1857,21 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
case dns_zone_redirect:
count = 0;
obj = NULL;
(void)cfg_map_get(zoptions, "masters", &obj);
(void)cfg_map_get(zoptions, "primaries", &obj);
if (obj == NULL) {
(void)cfg_map_get(zoptions, "masters", &obj);
}
/*
* Use the built-in master server list if one was not
* Use the built-in primary server list if one was not
* explicitly specified and this is a root zone mirror.
*/
if (obj == NULL && ztype == dns_zone_mirror &&
dns_name_equal(dns_zone_getorigin(zone), dns_rootname))
{
result = named_config_getmastersdef(
named_g_config, DEFAULT_IANA_ROOT_ZONE_MASTERS,
&obj);
result = named_config_getprimariesdef(
named_g_config,
DEFAULT_IANA_ROOT_ZONE_PRIMARIES, &obj);
RETERR(result);
}
if (obj != NULL) {
@ -1874,13 +1880,13 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
RETERR(named_config_getipandkeylist(config, obj, mctx,
&ipkl));
result = dns_zone_setmasterswithkeys(
result = dns_zone_setprimarieswithkeys(
mayberaw, ipkl.addrs, ipkl.keys, ipkl.count);
count = ipkl.count;
dns_ipkeylist_clear(mctx, &ipkl);
RETERR(result);
} else {
result = dns_zone_setmasters(mayberaw, NULL, 0);
result = dns_zone_setprimaries(mayberaw, NULL, 0);
}
RETERR(result);

2
bin/tests/optional/zone_test.c
View file

@ -114,7 +114,7 @@ setup(const char *zonename, const char *filename, const char *classname) {
dns_zone_setclass(zone, rdclass);
if (zonetype == dns_zone_slave) {
dns_zone_setmasters(zone, &addr, 1);
dns_zone_setprimaries(zone, &addr, 1);
}
result = dns_zone_load(zone, false);

4
bin/tests/system/acl/ns2/named1.conf.in
View file

@ -48,12 +48,12 @@ zone "." {
};
zone "example" {
type master;
type primary;
file "example.db";
};
zone "tsigzone" {
type master;
type primary;
file "tsigzone.db";
allow-transfer { !key one; any; };
};

4
bin/tests/system/acl/ns2/named2.conf.in
View file

@ -48,12 +48,12 @@ zone "." {
};
zone "example" {
type master;
type primary;
file "example.db";
};
zone "tsigzone" {
type master;
type primary;
file "tsigzone.db";
/*
* 0a00::/8 and 10/8 are the same bits, but different address

4
bin/tests/system/acl/ns2/named3.conf.in
View file

@ -61,12 +61,12 @@ zone "." {
};
zone "example" {
type master;
type primary;
file "example.db";
};
zone "tsigzone" {
type master;
type primary;
file "tsigzone.db";
allow-transfer { !reject; accept; };
};

4
bin/tests/system/acl/ns2/named4.conf.in
View file

@ -60,12 +60,12 @@ zone "." {
};
zone "example" {
type master;
type primary;
file "example.db";
};
zone "tsigzone" {
type master;
type primary;
file "tsigzone.db";
allow-transfer { !rejectkeys; !rejectaddrs; !check1; !check2; any; };
};

4
bin/tests/system/acl/ns2/named5.conf.in
View file

@ -50,12 +50,12 @@ zone "." {
};
zone "example" {
type master;
type primary;
file "example.db";
};
zone "tsigzone" {
type master;
type primary;
file "tsigzone.db";
allow-transfer { !key one; any; };
};

2
bin/tests/system/acl/ns4/named.conf.in
View file

@ -33,6 +33,6 @@ key rndc_key {
};
zone "existing" {
type master;
type primary;
file "existing.db";
};

4
bin/tests/system/acl/tests.sh
View file

@ -169,7 +169,7 @@ status=`expr $status + $ret`
echo_i "testing allow-transfer ACLs against ns3 (no existing zones)"
echo_i "calling addzone example.com on ns3"
$RNDCCMD 10.53.0.3 addzone 'example.com {type master; file "example.db"; }; '
$RNDCCMD 10.53.0.3 addzone 'example.com {type primary; file "example.db"; }; '
sleep 1
t=`expr $t + 1`
@ -198,7 +198,7 @@ status=`expr $status + $ret`
echo_i "testing allow-transfer ACLs against ns4 (1 pre-existing zone)"
echo_i "calling addzone example.com on ns4"
$RNDCCMD 10.53.0.4 addzone 'example.com {type master; file "example.db"; }; '
$RNDCCMD 10.53.0.4 addzone 'example.com {type primary; file "example.db"; }; '
sleep 1
t=`expr $t + 1`

12
bin/tests/system/additional/ns1/named1.conf.in
View file

@ -30,31 +30,31 @@ controls {
};
zone "." {
type master;
type primary;
file "root.db";
};
zone "rt.example" {
type master;
type primary;
file "rt.db";
};
zone "naptr.example" {
type master;
type primary;
file "naptr.db";
};
zone "rt2.example" {
type master;
type primary;
file "rt2.db";
};
zone "naptr2.example" {
type master;
type primary;
file "naptr2.db";
};
zone "nid.example" {
type master;
type primary;
file "nid.db";
};

12
bin/tests/system/additional/ns1/named2.conf.in
View file

@ -30,31 +30,31 @@ controls {
};
zone "." {
type master;
type primary;
file "root.db";
};
zone "rt.example" {
type master;
type primary;
file "rt.db";
};
zone "naptr.example" {
type master;
type primary;
file "naptr.db";
};
zone "rt2.example" {
type master;
type primary;
file "rt2.db";
};
zone "naptr2.example" {
type master;
type primary;
file "naptr2.db";
};
zone "nid.example" {
type master;
type primary;
file "nid.db";
};

12
bin/tests/system/additional/ns1/named3.conf.in
View file

@ -31,31 +31,31 @@ controls {
};
zone "." {
type master;
type primary;
file "root.db";
};
zone "rt.example" {
type master;
type primary;
file "rt.db";
};
zone "naptr.example" {
type master;
type primary;
file "naptr.db";
};
zone "rt2.example" {
type master;
type primary;
file "rt2.db";
};
zone "naptr2.example" {
type master;
type primary;
file "naptr2.db";
};
zone "nid.example" {
type master;
type primary;
file "nid.db";
};

16
bin/tests/system/additional/ns1/named4.conf.in
View file

@ -30,41 +30,41 @@ controls {
};
zone "." {
type master;
type primary;
file "root.db";
};
zone "mx.example" {
type master;
type primary;
file "mx.db";
};
zone "srv.example" {
type master;
type primary;
file "srv.db";
};
zone "rt.example" {
type master;
type primary;
file "rt.db";
};
zone "naptr.example" {
type master;
type primary;
file "naptr.db";
};
zone "rt2.example" {
type master;
type primary;
file "rt2.db";
};
zone "naptr2.example" {
type master;
type primary;
file "naptr2.db";
};
zone "nid.example" {
type master;
type primary;
file "nid.db";
};

2
bin/tests/system/additional/ns2/named.conf.in
View file

@ -23,6 +23,6 @@ options {
};
zone "." {
type master;
type primary;
file "root.db";
};

4
bin/tests/system/additional/ns3/named.conf.in
View file

@ -30,11 +30,11 @@ zone "." {
};
zone "ex" {
type master;
type primary;
file "ex.db";
};
zone "ex2" {
type master;
type primary;
file "ex2.db";
};

4
bin/tests/system/addzone/clean.sh
View file

@ -24,7 +24,7 @@ rm -f ./ns3/*.nzd ./ns3/*.nzd-lock
rm -f ./ns2/core*
rm -f ./ns2/inline.db.jbk
rm -f ./ns2/inline.db.signed
rm -f ./ns2/inlineslave.bk*
rm -f ./ns2/inlinesec.bk*
rm -rf ./ns2/new-zones
rm -f ./ns*/named.lock
rm -f ./ns*/named.run ./ns*/named.run.prev
@ -32,7 +32,7 @@ rm -f ./ns2/nzf-*
rm -f ./ns3/named.conf
rm -f ./ns3/*.nzf ./ns3/*.nzf~
rm -f ./ns3/*.nzd ns3/*.nzd-lock
rm -f ./ns3/inlineslave.db
rm -f ./ns3/inlinesec.db
rm -f ./ns1/redirect.db
rm -f ./ns2/redirect.db
rm -f ./ns2/redirect.bk

2
bin/tests/system/addzone/ns1/inlineslave.db → bin/tests/system/addzone/ns1/inlinesec.db
View file

@ -7,7 +7,7 @@
; See the COPYRIGHT file distributed with this work for additional
; information regarding copyright ownership.
$ORIGIN inlineslave.example.
$ORIGIN inlinesec.example.
$TTL 300 ; 5 minutes
@ IN SOA mname1. . (
1 ; serial

6
bin/tests/system/addzone/ns1/named.conf.in
View file

@ -33,9 +33,9 @@ zone "." {
file "../../common/root.hint";
};
zone "inlineslave.example" {
type master;
file "inlineslave.db";
zone "inlinesec.example" {
type primary;
file "inlinesec.db";
};
zone "." {

2
bin/tests/system/addzone/ns2/default.nzf.in
View file

@ -1 +1 @@
zone previous.example { type master; file "previous.db"; };
zone previous.example { type primary; file "previous.db"; };

4
bin/tests/system/addzone/ns2/named1.conf.in
View file

@ -31,11 +31,11 @@ zone "." {
};
zone "normal.example" {
type master;
type primary;
file "normal.db";
};
zone "finaldot.example." {
type master;
type primary;
file "normal.db";
};

2
bin/tests/system/addzone/ns2/named2.conf.in
View file

@ -37,7 +37,7 @@ view internal {
};
zone "policy" {
type master;
type primary;
file "normal.db";
};
};

2
bin/tests/system/addzone/ns2/named3.conf.in
View file

@ -37,7 +37,7 @@ view internal {
};
zone "policy" {
type master;
type primary;
file "normal.db";
};
};

4
bin/tests/system/addzone/ns3/named1.conf.in
View file

@ -26,10 +26,10 @@ options {
};
zone "." {
type master;
type primary;
file "redirect.db";
};
masters "testmaster" {
primaries "test" {
192.5.5.241;
};

157
bin/tests/system/addzone/tests.sh
View file

@ -54,7 +54,7 @@ fi
echo_i "adding new zone ($n)"
ret=0
$RNDCCMD 10.53.0.2 addzone 'added.example { type master; file "added.db"; };' 2>&1 | sed 's/^/I:ns2 /'
$RNDCCMD 10.53.0.2 addzone 'added.example { type primary; file "added.db"; };' 2>&1 | sed 's/^/I:ns2 /'
_check_adding_new_zone () (
$DIG $DIGOPTS @10.53.0.2 a.added.example a > dig.out.ns2.$n &&
grep 'status: NOERROR' dig.out.ns2.$n > /dev/null &&
@ -85,7 +85,8 @@ status=`expr $status + $ret`
echo_i "adding a zone that requires quotes ($n)"
ret=0
$RNDCCMD 10.53.0.2 addzone '"32/1.0.0.127-in-addr.added.example" { check-names ignore; type master; file "added.db"; };' 2>&1 | sed 's/^/I:ns2 /'
$RNDCCMD 10.53.0.2 addzone '"32/1.0.0.127-in-addr.added.example" {
check-names ignore; type primary; file "added.db"; };' 2>&1 | sed 's/^/I:ns2 /'
_check_zone_that_requires_quotes() (
$DIG $DIGOPTS @10.53.0.2 "a.32/1.0.0.127-in-addr.added.example" a > dig.out.ns2.$n &&
grep 'status: NOERROR' dig.out.ns2.$n > /dev/null &&
@ -98,7 +99,7 @@ status=`expr $status + $ret`
echo_i "adding a zone with a quote in the name ($n)"
ret=0
$RNDCCMD 10.53.0.2 addzone '"foo\"bar.example" { check-names ignore; type master; file "added.db"; };' 2>&1 | sed 's/^/I:ns2 /'
$RNDCCMD 10.53.0.2 addzone '"foo\"bar.example" { check-names ignore; type primary; file "added.db"; };' 2>&1 | sed 's/^/I:ns2 /'
_check_zone_with_a_quote() (
$DIG $DIGOPTS @10.53.0.2 "a.foo\"bar.example" a > dig.out.ns2.$n &&
grep 'status: NOERROR' dig.out.ns2.$n > /dev/null &&
@ -109,11 +110,11 @@ n=`expr $n + 1`
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
echo_i "adding new zone with missing master file ($n)"
echo_i "adding new zone with missing file ($n)"
ret=0
$DIG $DIGOPTS +all @10.53.0.2 a.missing.example a > dig.out.ns2.pre.$n || ret=1
grep "status: REFUSED" dig.out.ns2.pre.$n > /dev/null || ret=1
$RNDCCMD 10.53.0.2 addzone 'missing.example { type master; file "missing.db"; };' 2> rndc.out.ns2.$n
$RNDCCMD 10.53.0.2 addzone 'missing.example { type primary; file "missing.db"; };' 2> rndc.out.ns2.$n
grep "file not found" rndc.out.ns2.$n > /dev/null || ret=1
$DIG $DIGOPTS +all @10.53.0.2 a.missing.example a > dig.out.ns2.post.$n || ret=1
grep "status: REFUSED" dig.out.ns2.post.$n > /dev/null || ret=1
@ -135,7 +136,7 @@ fi
echo_i "checking rndc showzone with previously added zone ($n)"
ret=0
$RNDCCMD 10.53.0.2 showzone previous.example > rndc.out.ns2.$n
expected='zone "previous.example" { type master; file "previous.db"; };'
expected='zone "previous.example" { type primary; file "previous.db"; };'
[ "`cat rndc.out.ns2.$n`" = "$expected" ] || ret=1
n=`expr $n + 1`
if [ $ret != 0 ]; then echo_i "failed"; fi
@ -213,7 +214,7 @@ status=`expr $status + $ret`
echo_i "checking rndc showzone with a normally-loaded zone ($n)"
ret=0
$RNDCCMD 10.53.0.2 showzone normal.example > rndc.out.ns2.$n
expected='zone "normal.example" { type master; file "normal.db"; };'
expected='zone "normal.example" { type primary; file "normal.db"; };'
[ "`cat rndc.out.ns2.$n`" = "$expected" ] || ret=1
n=`expr $n + 1`
if [ $ret != 0 ]; then echo_i "failed"; fi
@ -222,7 +223,7 @@ status=`expr $status + $ret`
echo_i "checking rndc showzone with a normally-loaded zone with trailing dot ($n)"
ret=0
$RNDCCMD 10.53.0.2 showzone finaldot.example > rndc.out.ns2.$n
expected='zone "finaldot.example." { type master; file "normal.db"; };'
expected='zone "finaldot.example." { type primary; file "normal.db"; };'
[ "`cat rndc.out.ns2.$n`" = "$expected" ] || ret=1
n=`expr $n + 1`
if [ $ret != 0 ]; then echo_i "failed"; fi
@ -272,79 +273,79 @@ n=`expr $n + 1`
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
echo_i "attempting to add master zone with inline signing ($n)"
$RNDCCMD 10.53.0.2 addzone 'inline.example { type master; file "inline.db"; inline-signing yes; };' 2>&1 | sed 's/^/I:ns2 /'
_check_add_master_zone_with_inline() (
echo_i "attempting to add primary zone with inline signing ($n)"
$RNDCCMD 10.53.0.2 addzone 'inline.example { type primary; file "inline.db"; inline-signing yes; };' 2>&1 | sed 's/^/I:ns2 /'
_check_add_primary_zone_with_inline() (
$DIG $DIGOPTS @10.53.0.2 a.inline.example a > dig.out.ns2.$n &&
grep 'status: NOERROR' dig.out.ns2.$n > /dev/null &&
grep '^a.inline.example' dig.out.ns2.$n > /dev/null
)
retry_quiet 5 _check_add_master_zone_with_inline || ret=1
retry_quiet 5 _check_add_primary_zone_with_inline || ret=1
n=`expr $n + 1`
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
echo_i "attempting to add master zone with inline signing and missing master ($n)"
echo_i "attempting to add primary zone with inline signing and missing file ($n)"
ret=0
$RNDCCMD 10.53.0.2 addzone 'inlinemissing.example { type master; file "missing.db"; inline-signing yes; };' 2> rndc.out.ns2.$n
$RNDCCMD 10.53.0.2 addzone 'inlinemissing.example { type primary; file "missing.db"; inline-signing yes; };' 2> rndc.out.ns2.$n
grep "file not found" rndc.out.ns2.$n > /dev/null || ret=1
n=`expr $n + 1`
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
echo_i "attempting to add slave zone with inline signing ($n)"
$RNDCCMD 10.53.0.2 addzone 'inlineslave.example { type slave; masters { 10.53.0.1; }; file "inlineslave.bk"; inline-signing yes; };' 2>&1 | sed 's/^/I:ns2 /'
_check_add_slave_with_inline() (
$DIG $DIGOPTS @10.53.0.2 a.inlineslave.example a > dig.out.ns2.$n &&
echo_i "attempting to add secondary zone with inline signing ($n)"
$RNDCCMD 10.53.0.2 addzone 'inlinesec.example { type secondary; primaries { 10.53.0.1; }; file "inlinesec.bk"; inline-signing yes; };' 2>&1 | sed 's/^/I:ns2 /'
_check_add_secondary_with_inline() (
$DIG $DIGOPTS @10.53.0.2 a.inlinesec.example a > dig.out.ns2.$n &&
grep 'status: NOERROR' dig.out.ns2.$n > /dev/null &&
grep '^a.inlineslave.example' dig.out.ns2.$n > /dev/null
grep '^a.inlinesec.example' dig.out.ns2.$n > /dev/null
)
retry_quiet 5 _check_add_slave_with_inline || ret=1
retry_quiet 5 _check_add_secondary_with_inline || ret=1
n=`expr $n + 1`
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
echo_i "attempting to delete slave zone with inline signing ($n)"
echo_i "attempting to delete secondary zone with inline signing ($n)"
ret=0
retry_quiet 10 test -f ns2/inlineslave.bk.signed -a -f ns2/inlineslave.bk || ret=1
$RNDCCMD 10.53.0.2 delzone inlineslave.example > rndc.out2.test$n 2>&1 || ret=1
test -f inlineslave.bk ||
grep '^inlineslave.bk$' rndc.out2.test$n > /dev/null || {
echo_i "failed to report inlineslave.bk"; ret=1;
retry_quiet 10 test -f ns2/inlinesec.bk.signed -a -f ns2/inlinesec.bk || ret=1
$RNDCCMD 10.53.0.2 delzone inlinesec.example > rndc.out2.test$n 2>&1 || ret=1
test -f inlinesec.bk ||
grep '^inlinesec.bk$' rndc.out2.test$n > /dev/null || {
echo_i "failed to report inlinesec.bk"; ret=1;
}
test ! -f inlineslave.bk.signed ||
grep '^inlineslave.bk.signed$' rndc.out2.test$n > /dev/null || {
echo_i "failed to report inlineslave.bk.signed"; ret=1;
test ! -f inlinesec.bk.signed ||
grep '^inlinesec.bk.signed$' rndc.out2.test$n > /dev/null || {
echo_i "failed to report inlinesec.bk.signed"; ret=1;
}
n=`expr $n + 1`
status=`expr $status + $ret`
echo_i "restoring slave zone with inline signing ($n)"
$RNDCCMD 10.53.0.2 addzone 'inlineslave.example { type slave; masters { 10.53.0.1; }; file "inlineslave.bk"; inline-signing yes; };' 2>&1 | sed 's/^/I:ns2 /'
_check_restoring_slave_with_inline() (
$DIG $DIGOPTS @10.53.0.2 a.inlineslave.example a > dig.out.ns2.$n &&
echo_i "restoring secondary zone with inline signing ($n)"
$RNDCCMD 10.53.0.2 addzone 'inlinesec.example { type secondary; primaries { 10.53.0.1; }; file "inlinesec.bk"; inline-signing yes; };' 2>&1 | sed 's/^/I:ns2 /'
_check_restoring_secondary_with_inline() (
$DIG $DIGOPTS @10.53.0.2 a.inlinesec.example a > dig.out.ns2.$n &&
grep 'status: NOERROR' dig.out.ns2.$n > /dev/null &&
grep '^a.inlineslave.example' dig.out.ns2.$n > /dev/null
grep '^a.inlinesec.example' dig.out.ns2.$n > /dev/null
)
retry_quiet 5 _check_restoring_slave_with_inline || ret=1
retry_quiet 5 _check_restoring_secondary_with_inline || ret=1
n=`expr $n + 1`
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
echo_i "deleting slave zone with automatic zone file removal ($n)"
echo_i "deleting secondary zone with automatic zone file removal ($n)"
ret=0
retry_quiet 10 test -f ns2/inlineslave.bk.signed -a -f ns2/inlineslave.bk || ret=1
$RNDCCMD 10.53.0.2 delzone -clean inlineslave.example > /dev/null 2>&1
retry_quiet 10 test ! -f ns2/inlineslave.bk.signed -a ! -f ns2/inlineslave.bk
retry_quiet 10 test -f ns2/inlinesec.bk.signed -a -f ns2/inlinesec.bk || ret=1
$RNDCCMD 10.53.0.2 delzone -clean inlinesec.example > /dev/null 2>&1
retry_quiet 10 test ! -f ns2/inlinesec.bk.signed -a ! -f ns2/inlinesec.bk
n=`expr $n + 1`
status=`expr $status + $ret`
echo_i "modifying zone configuration ($n)"
ret=0
$RNDCCMD 10.53.0.2 addzone 'mod.example { type master; file "added.db"; };' 2>&1 | sed 's/^/ns2 /' | cat_i
$RNDCCMD 10.53.0.2 addzone 'mod.example { type primary; file "added.db"; };' 2>&1 | sed 's/^/ns2 /' | cat_i
$DIG +norec $DIGOPTS @10.53.0.2 mod.example ns > dig.out.ns2.1.$n || ret=1
grep 'status: NOERROR' dig.out.ns2.1.$n > /dev/null || ret=1
$RNDCCMD 10.53.0.2 modzone 'mod.example { type master; file "added.db"; allow-query { none; }; };' 2>&1 | sed 's/^/ns2 /' | cat_i
$RNDCCMD 10.53.0.2 modzone 'mod.example { type primary; file "added.db"; allow-query { none; }; };' 2>&1 | sed 's/^/ns2 /' | cat_i
$DIG +norec $DIGOPTS @10.53.0.2 mod.example ns > dig.out.ns2.2.$n || ret=1
$RNDCCMD 10.53.0.2 showzone mod.example | grep 'allow-query { "none"; };' > /dev/null 2>&1 || ret=1
n=`expr $n + 1`
@ -353,7 +354,7 @@ status=`expr $status + $ret`
echo_i "check that adding a 'stub' zone works ($n)"
ret=0
$RNDCCMD 10.53.0.2 addzone 'stub.example { type stub; masters { 1.2.3.4; }; file "stub.example.bk"; };' > rndc.out.ns2.$n 2>&1 || ret=1
$RNDCCMD 10.53.0.2 addzone 'stub.example { type stub; primaries { 1.2.3.4; }; file "stub.example.bk"; };' > rndc.out.ns2.$n 2>&1 || ret=1
n=`expr $n + 1`
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
@ -365,22 +366,22 @@ n=`expr $n + 1`
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
echo_i "check that adding a 'master redirect' zone works ($n)"
echo_i "check that adding a 'primary redirect' zone works ($n)"
ret=0
$RNDCCMD 10.53.0.2 addzone '"." { type redirect; file "redirect.db"; };' > rndc.out.ns2.$n 2>&1 || ret=1
_check_add_master_redirect() (
_check_add_primary_redirect() (
$RNDCCMD 10.53.0.2 showzone -redirect > showzone.out.ns2.$n 2>&1 &&
grep "type redirect;" showzone.out.ns2.$n > /dev/null &&
$RNDCCMD 10.53.0.2 zonestatus -redirect > zonestatus.out.ns2.$n 2>&1 &&
grep "type: redirect" zonestatus.out.ns2.$n > /dev/null &&
grep "serial: 0" zonestatus.out.ns2.$n > /dev/null
)
retry_quiet 10 _check_add_master_redirect || ret=1
retry_quiet 10 _check_add_primary_redirect || ret=1
n=`expr $n + 1`
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
echo_i "check that reloading a added 'master redirect' zone works ($n)"
echo_i "check that reloading a added 'primary redirect' zone works ($n)"
ret=0
sleep 1
cp -f ns2/redirect.db.2 ns2/redirect.db
@ -390,63 +391,63 @@ n=`expr $n + 1`
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
echo_i "check that retransfer of a added 'master redirect' zone fails ($n)"
echo_i "check that retransfer of a added 'primary redirect' zone fails ($n)"
ret=0
$RNDCCMD 10.53.0.2 retransfer -redirect > rndc.out.ns2.$n 2>&1 && ret=1
n=`expr $n + 1`
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
echo_i "check that deleting a 'master redirect' zone works ($n)"
echo_i "check that deleting a 'primary redirect' zone works ($n)"
ret=0
$RNDCCMD 10.53.0.2 delzone -redirect > rndc.out.ns2.$n 2>&1 || ret=1
_check_deleting_master_redirect() (
_check_deleting_primary_redirect() (
$RNDCCMD 10.53.0.2 showzone -redirect > showzone.out.ns2.$n 2>&1 || true
grep 'not found' showzone.out.ns2.$n > /dev/null
)
retry_quiet 10 _check_deleting_master_redirect || ret=1
retry_quiet 10 _check_deleting_primary_redirect || ret=1
n=`expr $n + 1`
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
echo_i "check that adding a 'slave redirect' zone works ($n)"
echo_i "check that adding a 'secondary redirect' zone works ($n)"
ret=0
$RNDCCMD 10.53.0.2 addzone '"." { type redirect; masters { 10.53.0.3;}; file "redirect.bk"; };' > rndc.out.ns2.$n 2>&1 || ret=1
_check_adding_slave_redirect() (
$RNDCCMD 10.53.0.2 addzone '"." { type redirect; primaries { 10.53.0.3;}; file "redirect.bk"; };' > rndc.out.ns2.$n 2>&1 || ret=1
_check_adding_secondary_redirect() (
$RNDCCMD 10.53.0.2 showzone -redirect > showzone.out.ns2.$n 2>&1 &&
grep "type redirect;" showzone.out.ns2.$n > /dev/null &&
$RNDCCMD 10.53.0.2 zonestatus -redirect > zonestatus.out.ns2.$n 2>&1 &&
grep "type: redirect" zonestatus.out.ns2.$n > /dev/null &&
grep "serial: 0" zonestatus.out.ns2.$n > /dev/null
)
retry_quiet 10 _check_adding_slave_redirect || ret=1
retry_quiet 10 _check_adding_secondary_redirect || ret=1
n=`expr $n + 1`
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
echo_i "check that retransfering a added 'slave redirect' zone works ($n)"
echo_i "check that retransfering a added 'secondary redirect' zone works ($n)"
ret=0
cp -f ns3/redirect.db.2 ns3/redirect.db
$RNDCCMD 10.53.0.3 reload . > showzone.out.ns3.$n 2>&1 || ret=1
_check_retransfering_slave_redirect() (
_check_retransfering_secondary_redirect() (
$RNDCCMD 10.53.0.2 retransfer -redirect > rndc.out.ns2.$n 2>&1 &&
$RNDCCMD 10.53.0.2 zonestatus -redirect > zonestatus.out.ns2.$n 2>&1 &&
grep "type: redirect" zonestatus.out.ns2.$n > /dev/null &&
grep "serial: 1" zonestatus.out.ns2.$n > /dev/null
)
retry_quiet 10 _check_retransfering_slave_redirect || ret=1
retry_quiet 10 _check_retransfering_secondary_redirect || ret=1
n=`expr $n + 1`
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
echo_i "check that deleting a 'slave redirect' zone works ($n)"
echo_i "check that deleting a 'secondary redirect' zone works ($n)"
ret=0
$RNDCCMD 10.53.0.2 delzone -redirect > rndc.out.ns2.$n 2>&1 || ret=1
_check_deleting_slave_redirect() (
_check_deleting_secondary_redirect() (
$RNDCCMD 10.53.0.2 showzone -redirect > showzone.out.ns2.$n 2>&1 || true
grep 'not found' showzone.out.ns2.$n > /dev/null
)
retry_quiet 10 _check_deleting_slave_redirect || ret=1
retry_quiet 10 _check_deleting_secondary_redirect || ret=1
n=`expr $n + 1`
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
@ -500,7 +501,7 @@ $DIG +norec $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.added.example a > dig.out.ns2.int
grep 'status: NOERROR' dig.out.ns2.intpre.$n > /dev/null || ret=1
$DIG +norec $DIGOPTS @10.53.0.4 -b 10.53.0.4 a.added.example a > dig.out.ns2.extpre.$n || ret=1
grep 'status: REFUSED' dig.out.ns2.extpre.$n > /dev/null || ret=1
$RNDCCMD 10.53.0.2 addzone 'added.example in external { type master; file "added.db"; };' 2>&1 | sed 's/^/I:ns2 /'
$RNDCCMD 10.53.0.2 addzone 'added.example in external { type primary; file "added.db"; };' 2>&1 | sed 's/^/I:ns2 /'
$DIG +norec $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.added.example a > dig.out.ns2.int.$n || ret=1
grep 'status: NOERROR' dig.out.ns2.int.$n > /dev/null || ret=1
$DIG +norec $DIGOPTS @10.53.0.4 -b 10.53.0.4 a.added.example a > dig.out.ns2.ext.$n || ret=1
@ -547,9 +548,9 @@ status=`expr $status + $ret`
echo_i "checking rndc showzone with newly added zone ($n)"
_check_rndc_showzone_newly_added() (
if [ -z "$NZD" ]; then
expected='zone "added.example" in external { type master; file "added.db"; };'
expected='zone "added.example" in external { type primary; file "added.db"; };'
else
expected='zone "added.example" { type master; file "added.db"; };'
expected='zone "added.example" { type primary; file "added.db"; };'
fi
$RNDCCMD 10.53.0.2 showzone added.example in external > rndc.out.ns2.$n 2>/dev/null &&
[ "`cat rndc.out.ns2.$n`" = "$expected" ]
@ -576,7 +577,7 @@ echo_i "attempting to add zone to internal view ($n)"
ret=0
$DIG +norec $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.added.example a > dig.out.ns2.pre.$n || ret=1
grep 'status: NOERROR' dig.out.ns2.pre.$n > /dev/null || ret=1
$RNDCCMD 10.53.0.2 addzone 'added.example in internal { type master; file "added.db"; };' 2> rndc.out.ns2.$n
$RNDCCMD 10.53.0.2 addzone 'added.example in internal { type primary; file "added.db"; };' 2> rndc.out.ns2.$n
grep "permission denied" rndc.out.ns2.$n > /dev/null || ret=1
$DIG $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.added.example a > dig.out.ns2.int.$n || ret=1
grep 'status: NOERROR' dig.out.ns2.int.$n > /dev/null || ret=1
@ -596,7 +597,7 @@ status=`expr $status + $ret`
echo_i "adding new zone again to external view ($n)"
ret=0
$RNDCCMD 10.53.0.2 addzone 'added.example in external { type master; file "added.db"; };' 2>&1 | sed 's/^/I:ns2 /'
$RNDCCMD 10.53.0.2 addzone 'added.example in external { type primary; file "added.db"; };' 2>&1 | sed 's/^/I:ns2 /'
_check_adding_new_zone_again_external() (
$DIG +norec $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.added.example a > dig.out.ns2.int.$n &&
grep 'status: NOERROR' dig.out.ns2.int.$n > /dev/null &&
@ -641,7 +642,7 @@ $DIG +norec $DIGOPTS @10.53.0.4 -b 10.53.0.4 a.added.example a > dig.out.ns2.ext
grep 'status: REFUSED' dig.out.ns2.extpre.$n > /dev/null || ret=1
$DIG +norec $DIGOPTS @10.53.0.5 -b 10.53.0.5 a.added.example a > dig.out.ns2.dirpre.$n || ret=1
grep 'status: REFUSED' dig.out.ns2.dirpre.$n > /dev/null || ret=1
$RNDCCMD 10.53.0.2 addzone 'added.example in directory { type master; file "added.db"; };' 2>&1 | sed 's/^/I:ns2 /'
$RNDCCMD 10.53.0.2 addzone 'added.example in directory { type primary; file "added.db"; };' 2>&1 | sed 's/^/I:ns2 /'
$DIG +norec $DIGOPTS @10.53.0.2 -b 10.53.0.2 a.added.example a > dig.out.ns2.int.$n || ret=1
grep 'status: NOERROR' dig.out.ns2.int.$n > /dev/null || ret=1
$DIG +norec $DIGOPTS @10.53.0.4 -b 10.53.0.4 a.added.example a > dig.out.ns2.ext.$n || ret=1
@ -687,10 +688,10 @@ status=`expr $status + $ret`
echo_i "check delzone after reconfig failure ($n)"
ret=0
$RNDCCMD 10.53.0.3 addzone 'inlineslave.example. IN { type slave; file "inlineslave.db"; masterfile-format text; masters { testmaster; }; };' > /dev/null 2>&1 || ret=1
$RNDCCMD 10.53.0.3 addzone 'inlinesec.example. IN { type secondary; file "inlinesec.db"; masterfile-format text; primaries { test; }; };' > /dev/null 2>&1 || ret=1
copy_setports ns3/named2.conf.in ns3/named.conf
rndc_reconfig ns3 10.53.0.3
$RNDCCMD 10.53.0.3 delzone inlineslave.example > /dev/null 2>&1 || ret=1
$RNDCCMD 10.53.0.3 delzone inlinesec.example > /dev/null 2>&1 || ret=1
n=`expr $n + 1`
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
@ -699,9 +700,9 @@ if ! $FEATURETEST --with-lmdb
then
echo_i "check that addzone is fully reversed on failure (--with-lmdb=no) ($n)"
ret=0
$RNDCCMD 10.53.0.3 addzone "test1.baz" '{ type master; file "e.db"; };' > /dev/null 2>&1 || ret=1
$RNDCCMD 10.53.0.3 addzone "test2.baz" '{ type master; file "dne.db"; };' > /dev/null 2>&1 && ret=1
$RNDCCMD 10.53.0.3 addzone "test3.baz" '{ type master; file "e.db"; };' > /dev/null 2>&1 || ret=1
$RNDCCMD 10.53.0.3 addzone "test1.baz" '{ type primary; file "e.db"; };' > /dev/null 2>&1 || ret=1
$RNDCCMD 10.53.0.3 addzone "test2.baz" '{ type primary; file "dne.db"; };' > /dev/null 2>&1 && ret=1
$RNDCCMD 10.53.0.3 addzone "test3.baz" '{ type primary; file "e.db"; };' > /dev/null 2>&1 || ret=1
$RNDCCMD 10.53.0.3 delzone "test3.baz" > /dev/null 2>&1 || ret=1
grep test2.baz ns3/_default.nzf > /dev/null && ret=1
n=`expr $n + 1`
@ -716,13 +717,13 @@ _check_version_bind() (
echo_i "check that named restarts with multiple added zones ($n)"
ret=0
$RNDCCMD 10.53.0.3 addzone "test4.baz" '{ type master; file "e.db"; };' > /dev/null 2>&1 || ret=1
$RNDCCMD 10.53.0.3 addzone "test5.baz" '{ type master; file "e.db"; };' > /dev/null 2>&1 || ret=1
$RNDCCMD 10.53.0.3 addzone '"test/.baz"' '{ type master; check-names ignore; file "e.db"; };' > /dev/null 2>&1 || ret=1
$RNDCCMD 10.53.0.3 addzone '"test\".baz"' '{ type master; check-names ignore; file "e.db"; };' > /dev/null 2>&1 || ret=1
$RNDCCMD 10.53.0.3 addzone '"test\\.baz"' '{ type master; check-names ignore; file "e.db"; };' > /dev/null 2>&1 || ret=1
$RNDCCMD 10.53.0.3 addzone '"test\032.baz"' '{ type master; check-names ignore; file "e.db"; };' > /dev/null 2>&1 || ret=1
$RNDCCMD 10.53.0.3 addzone '"test\010.baz"' '{ type master; check-names ignore; file "e.db"; };' > /dev/null 2>&1 || ret=1
$RNDCCMD 10.53.0.3 addzone "test4.baz" '{ type primary; file "e.db"; };' > /dev/null 2>&1 || ret=1
$RNDCCMD 10.53.0.3 addzone "test5.baz" '{ type primary; file "e.db"; };' > /dev/null 2>&1 || ret=1
$RNDCCMD 10.53.0.3 addzone '"test/.baz"' '{ type primary; check-names ignore; file "e.db"; };' > /dev/null 2>&1 || ret=1
$RNDCCMD 10.53.0.3 addzone '"test\".baz"' '{ type primary; check-names ignore; file "e.db"; };' > /dev/null 2>&1 || ret=1
$RNDCCMD 10.53.0.3 addzone '"test\\.baz"' '{ type primary; check-names ignore; file "e.db"; };' > /dev/null 2>&1 || ret=1
$RNDCCMD 10.53.0.3 addzone '"test\032.baz"' '{ type primary; check-names ignore; file "e.db"; };' > /dev/null 2>&1 || ret=1
$RNDCCMD 10.53.0.3 addzone '"test\010.baz"' '{ type primary; check-names ignore; file "e.db"; };' > /dev/null 2>&1 || ret=1
$PERL $SYSTEMTESTTOP/stop.pl addzone ns3
$PERL $SYSTEMTESTTOP/start.pl --noclean --restart --port ${PORT} addzone ns3 || ret=1
retry_quiet 10 _check_version_bind || ret=1

2
bin/tests/system/allow-query/ns1/named.conf.in
View file

@ -18,6 +18,6 @@ options {
};
zone "." {
type master;
type primary;
file "root.db";
};

2
bin/tests/system/allow-query/ns2/named01.conf.in
View file

@ -25,6 +25,6 @@ zone "." {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};

2
bin/tests/system/allow-query/ns2/named02.conf.in
View file

@ -26,6 +26,6 @@ zone "." {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};

2
bin/tests/system/allow-query/ns2/named03.conf.in
View file

@ -26,6 +26,6 @@ zone "." {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};

2
bin/tests/system/allow-query/ns2/named04.conf.in
View file

@ -26,6 +26,6 @@ zone "." {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};

2
bin/tests/system/allow-query/ns2/named05.conf.in
View file

@ -26,6 +26,6 @@ zone "." {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};

2
bin/tests/system/allow-query/ns2/named06.conf.in
View file

@ -26,6 +26,6 @@ zone "." {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};

2
bin/tests/system/allow-query/ns2/named07.conf.in
View file

@ -28,6 +28,6 @@ zone "." {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};

2
bin/tests/system/allow-query/ns2/named08.conf.in
View file

@ -28,6 +28,6 @@ zone "." {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};

2
bin/tests/system/allow-query/ns2/named09.conf.in
View file

@ -28,6 +28,6 @@ zone "." {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};

2
bin/tests/system/allow-query/ns2/named10.conf.in
View file

@ -31,6 +31,6 @@ zone "." {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};

2
bin/tests/system/allow-query/ns2/named11.conf.in
View file

@ -37,6 +37,6 @@ zone "." {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};

2
bin/tests/system/allow-query/ns2/named12.conf.in
View file

@ -31,6 +31,6 @@ zone "." {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};

2
bin/tests/system/allow-query/ns2/named21.conf.in
View file

@ -27,7 +27,7 @@ view "internal" {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};
};

2
bin/tests/system/allow-query/ns2/named22.conf.in
View file

@ -29,7 +29,7 @@ view "internal" {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};

2
bin/tests/system/allow-query/ns2/named23.conf.in
View file

@ -29,7 +29,7 @@ view "internal" {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};
};

2
bin/tests/system/allow-query/ns2/named24.conf.in
View file

@ -29,7 +29,7 @@ view "internal" {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};
};

2
bin/tests/system/allow-query/ns2/named25.conf.in
View file

@ -29,7 +29,7 @@ view "internal" {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};
};

2
bin/tests/system/allow-query/ns2/named26.conf.in
View file

@ -29,7 +29,7 @@ view "internal" {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};
};

2
bin/tests/system/allow-query/ns2/named27.conf.in
View file

@ -31,7 +31,7 @@ view "internal" {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};

2
bin/tests/system/allow-query/ns2/named28.conf.in
View file

@ -31,7 +31,7 @@ view "internal" {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};
};

2
bin/tests/system/allow-query/ns2/named29.conf.in
View file

@ -31,7 +31,7 @@ view "internal" {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};
};

2
bin/tests/system/allow-query/ns2/named30.conf.in
View file

@ -34,7 +34,7 @@ view "internal" {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};
};

2
bin/tests/system/allow-query/ns2/named31.conf.in
View file

@ -41,7 +41,7 @@ view "internal" {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};
};

2
bin/tests/system/allow-query/ns2/named32.conf.in
View file

@ -34,7 +34,7 @@ view "internal" {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};
};

2
bin/tests/system/allow-query/ns2/named33.conf.in
View file

@ -30,7 +30,7 @@ view "internal" {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};

2
bin/tests/system/allow-query/ns2/named34.conf.in
View file

@ -30,7 +30,7 @@ view "internal" {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};
};

22
bin/tests/system/allow-query/ns2/named40.conf.in
View file

@ -39,67 +39,67 @@ zone "." {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};
zone "any.example" {
type master;
type primary;
file "generic.db";
allow-query { any; };
};
zone "none.example" {
type master;
type primary;
file "generic.db";
allow-query { none; };
};
zone "addrallow.example" {
type master;
type primary;
file "generic.db";
allow-query { 10.53.0.2; };
};
zone "addrnotallow.example" {
type master;
type primary;
file "generic.db";
allow-query { 10.53.0.1; };
};
zone "addrdisallow.example" {
type master;
type primary;
file "generic.db";
allow-query { ! 10.53.0.2; };
};
zone "aclallow.example" {
type master;
type primary;
file "generic.db";
allow-query { accept; };
};
zone "aclnotallow.example" {
type master;
type primary;
file "generic.db";
allow-query { badaccept; };
};
zone "acldisallow.example" {
type master;
type primary;
file "generic.db";
allow-query { ! accept; };
};
/* Also usable for testing key not allowed */
zone "keyallow.example" {
type master;
type primary;
file "generic.db";
allow-query { key one; };
};
zone "keydisallow.example" {
type master;
type primary;
file "generic.db";
allow-query { ! key one; };
};

2
bin/tests/system/allow-query/ns2/named53.conf.in
View file

@ -26,7 +26,7 @@ zone "." {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
allow-query { any; };
};

2
bin/tests/system/allow-query/ns2/named54.conf.in
View file

@ -26,7 +26,7 @@ zone "." {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
allow-query { none; };
};

2
bin/tests/system/allow-query/ns2/named55.conf.in
View file

@ -29,7 +29,7 @@ view "internal" {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
allow-query { any; };
};

2
bin/tests/system/allow-query/ns2/named56.conf.in
View file

@ -29,7 +29,7 @@ view "internal" {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
allow-query { none; };
};

4
bin/tests/system/allow-query/ns2/named57.conf.in
View file

@ -28,12 +28,12 @@ view "internal" {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};
zone "aclnotallow.example" {
type master;
type primary;
file "generic.db";
allow-query-on { none; };
};

6
bin/tests/system/allow-query/tests.sh
View file

@ -45,9 +45,9 @@
# In zone, with view set to none, zone set to any
# In zone, with view set to any, zone set to none
#
# zone types of master, slave and stub can be tested in parallel by using
# multiple instances (ns2 as master, ns3 as slave, ns4 as stub) and querying
# as necessary.
# zone types of primary, secondary and stub can be tested in parallel by
# using multiple instances (ns2 as primary, ns3 as secondary, ns4 as stub)
# and querying as necessary.
#
SYSTEMTESTTOP=..

6
bin/tests/system/auth/ns1/named.conf.in
View file

@ -23,19 +23,19 @@ options {
view main in {
zone example.net {
type master;
type primary;
file "example.net.db";
};
zone example.com {
type master;
type primary;
file "example.com.db";
};
};
view alt chaos {
zone example.chaos chaos {
type master;
type primary;
file "chaos.db";
};
};

8
bin/tests/system/auth/ns2/named.conf.in
View file

@ -22,13 +22,13 @@ options {
};
zone example.net {
type slave;
masters { 10.53.0.1; };
type secondary;
primaries { 10.53.0.1; };
file "example.net.bk";
};
zone example.com {
type slave;
masters { 10.53.0.1; };
type secondary;
primaries { 10.53.0.1; };
file "example.com.bk";
};

2
bin/tests/system/autosign/ns1/named.conf.in
View file

@ -34,7 +34,7 @@ controls {
};
zone "." {
type master;
type primary;
file "root.db";
allow-transfer { any; };
allow-query { any; };

12
bin/tests/system/autosign/ns2/named.conf.in
View file

@ -40,7 +40,7 @@ zone "." {
};
zone "example" {
type master;
type primary;
file "example.db";
allow-query { any; };
allow-transfer { any; };
@ -49,7 +49,7 @@ zone "example" {
};
zone "bar" {
type master;
type primary;
file "bar.db";
allow-query { any; };
allow-transfer { any; };
@ -59,7 +59,7 @@ zone "bar" {
};
zone "private.secure.example" {
type master;
type primary;
file "private.secure.example.db";
allow-query { any; };
allow-transfer { any; };
@ -68,7 +68,7 @@ zone "private.secure.example" {
};
zone "insecure.secure.example" {
type master;
type primary;
file "insecure.secure.example.db";
allow-query { any; };
allow-transfer { any; };
@ -77,7 +77,7 @@ zone "insecure.secure.example" {
};
zone "child.nsec3.example" {
type master;
type primary;
file "child.nsec3.example.db";
allow-query { any; };
allow-transfer { any; };
@ -86,7 +86,7 @@ zone "child.nsec3.example" {
};
zone "child.optout.example" {
type master;
type primary;
file "child.optout.example.db";
allow-query { any; };
allow-transfer { any; };

78
bin/tests/system/autosign/ns3/named.conf.in
View file

@ -44,59 +44,59 @@ zone "." {
};
zone "example" {
type slave;
masters { 10.53.0.2; };
type secondary;
primaries { 10.53.0.2; };
file "example.bk";
};
zone "bar" {
type slave;
masters { 10.53.0.2; };
type secondary;
primaries { 10.53.0.2; };
file "bar.bk";
};
zone "secure.example" {
type master;
type primary;
file "secure.example.db";
allow-update { any; };
auto-dnssec maintain;
};
zone "insecure.example" {
type master;
type primary;
file "insecure.example.db";
};
zone "nsec3.example" {
type master;
type primary;
file "nsec3.example.db";
allow-update { any; };
auto-dnssec maintain;
};
zone "autonsec3.example" {
type master;
type primary;
file "autonsec3.example.db";
allow-update { any; };
auto-dnssec maintain;
};
zone "optout.nsec3.example" {
type master;
type primary;
file "optout.nsec3.example.db";
allow-update { any; };
auto-dnssec maintain;
};
zone "nsec3.nsec3.example" {
type master;
type primary;
file "nsec3.nsec3.example.db";
allow-update { any; };
auto-dnssec maintain;
};
zone "jitter.nsec3.example" {
type master;
type primary;
file "jitter.nsec3.example.db";
allow-update { any; };
auto-dnssec maintain;
@ -106,77 +106,77 @@ zone "jitter.nsec3.example" {
};
zone "secure.nsec3.example" {
type master;
type primary;
file "secure.nsec3.example.db";
allow-update { any; };
auto-dnssec maintain;
};
zone "optout.example" {
type master;
type primary;
file "optout.example.db";
allow-update { any; };
auto-dnssec maintain;
};
zone "secure.optout.example" {
type master;
type primary;
file "secure.optout.example.db";
allow-update { any; };
auto-dnssec maintain;
};
zone "nsec3.optout.example" {
type master;
type primary;
file "nsec3.optout.example.db";
allow-update { any; };
auto-dnssec maintain;
};
zone "optout.optout.example" {
type master;
type primary;
file "optout.optout.example.db";
allow-update { any; };
auto-dnssec maintain;
};
zone "rsasha256.example" {
type master;
type primary;
file "rsasha256.example.db";
allow-update { any; };
auto-dnssec maintain;
};
zone "rsasha512.example" {
type master;
type primary;
file "rsasha512.example.db";
allow-update { any; };
auto-dnssec maintain;
};
zone "nsec.example" {
type master;
type primary;
file "nsec.example.db";
allow-update { any; };
auto-dnssec maintain;
};
zone "nsec3-to-nsec.example" {
type master;
type primary;
file "nsec3-to-nsec.example.db";
allow-update { any; };
auto-dnssec maintain;
};
zone "secure-to-insecure.example" {
type master;
type primary;
file "secure-to-insecure.example.db";
allow-update { any; };
dnssec-secure-to-insecure yes;
};
zone "secure-to-insecure2.example" {
type master;
type primary;
file "secure-to-insecure2.example.db";
allow-update { any; };
auto-dnssec maintain;
@ -184,7 +184,7 @@ zone "secure-to-insecure2.example" {
};
zone "oldsigs.example" {
type master;
type primary;
file "oldsigs.example.db";
allow-update { any; };
auto-dnssec maintain;
@ -194,70 +194,70 @@ zone "oldsigs.example" {
};
zone "prepub.example" {
type master;
type primary;
file "prepub.example.db";
allow-update { any; };
auto-dnssec maintain;
};
zone "ttl1.example" {
type master;
type primary;
file "ttl1.example.db";
allow-update { any; };
auto-dnssec maintain;
};
zone "ttl2.example" {
type master;
type primary;
file "ttl2.example.db";
allow-update { any; };
auto-dnssec maintain;
};
zone "ttl3.example" {
type master;
type primary;
file "ttl3.example.db";
allow-update { any; };
auto-dnssec maintain;
};
zone "ttl4.example" {
type master;
type primary;
file "ttl4.example.db";
allow-update { any; };
auto-dnssec maintain;
};
zone "delay.example" {
type master;
type primary;
file "delay.example.db";
allow-update { any; };
auto-dnssec maintain;
};
zone "nozsk.example" {
type master;
type primary;
file "nozsk.example.db";
allow-update { any; };
auto-dnssec maintain;
};
zone "inaczsk.example" {
type master;
type primary;
file "inaczsk.example.db";
allow-update { any; };
auto-dnssec maintain;
};
zone "sync.example" {
type master;
type primary;
file "sync.example.db";
allow-update { any; };
auto-dnssec maintain;
};
zone "kskonly.example" {
type master;
type primary;
file "kskonly.example.db";
allow-update { any; };
dnssec-dnskey-kskonly yes;
@ -265,7 +265,7 @@ zone "kskonly.example" {
};
zone "inacksk2.example" {
type master;
type primary;
file "inacksk2.example.db";
allow-update { any; };
dnssec-dnskey-kskonly yes;
@ -273,7 +273,7 @@ zone "inacksk2.example" {
};
zone "inacksk3.example" {
type master;
type primary;
file "inacksk3.example.db";
allow-update { any; };
dnssec-dnskey-kskonly yes;
@ -281,28 +281,28 @@ zone "inacksk3.example" {
};
zone "inaczsk2.example" {
type master;
type primary;
file "inaczsk2.example.db";
allow-update { any; };
auto-dnssec maintain;
};
zone "inaczsk3.example" {
type master;
type primary;
file "inaczsk3.example.db";
allow-update { any; };
auto-dnssec maintain;
};
zone "delzsk.example." {
type master;
type primary;
file "delzsk.example.db";
allow-update { any; };
auto-dnssec maintain;
};
zone "dname-at-apex-nsec3.example" {
type master;
type primary;
file "dname-at-apex-nsec3.example.db";
allow-update { any; };
auto-dnssec maintain;

4
bin/tests/system/autosign/tests.sh
View file

@ -1360,11 +1360,11 @@ status=`expr $status + $ret`
echo_i "test turning on auto-dnssec during reconfig ($n)"
ret=0
# first create a zone that doesn't have auto-dnssec
($RNDCCMD 10.53.0.3 addzone reconf.example '{ type master; file "reconf.example.db"; };' 2>&1 | sed 's/^/ns3 /' | cat_i) || ret=1
($RNDCCMD 10.53.0.3 addzone reconf.example '{ type primary; file "reconf.example.db"; };' 2>&1 | sed 's/^/ns3 /' | cat_i) || ret=1
rekey_calls=`grep "zone reconf.example.*next key event" ns3/named.run | wc -l`
[ "$rekey_calls" -eq 0 ] || ret=1
# ...then we add auto-dnssec and reconfigure
($RNDCCMD 10.53.0.3 modzone reconf.example '{ type master; file "reconf.example.db"; allow-update { any; }; auto-dnssec maintain; };' 2>&1 | sed 's/^/ns3 /' | cat_i) || ret=1
($RNDCCMD 10.53.0.3 modzone reconf.example '{ type primary; file "reconf.example.db"; allow-update { any; }; auto-dnssec maintain; };' 2>&1 | sed 's/^/ns3 /' | cat_i) || ret=1
rndc_reconfig ns3 10.53.0.3
for i in 0 1 2 3 4 5 6 7 8 9; do
lret=0

6
bin/tests/system/cacheclean/ns1/named.conf.in
View file

@ -25,16 +25,16 @@ options {
};
zone "." {
type master;
type primary;
file "example.db";
};
zone "flushtest.example" {
type master;
type primary;
file "flushtest.db";
};
zone "expire-test" {
type master;
type primary;
file "expire-test.db";
};

4
bin/tests/system/cacheclean/ns2/named.conf.in
View file

@ -43,6 +43,6 @@ zone "flushtest.example" {
};
zone "expire-test" {
type slave;
masters { 10.53.0.1; };
type secondary;
primaries { 10.53.0.1; };
};

4
bin/tests/system/cacheclean/tests.sh
View file

@ -247,7 +247,7 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
n=`expr $n + 1`
echo_i "check expire option returned from master zone ($n)"
echo_i "check expire option returned from primary zone ($n)"
ret=0
$DIG @10.53.0.1 -p ${PORT} +expire soa expire-test > dig.out.expire
grep EXPIRE: dig.out.expire > /dev/null || ret=1
@ -255,7 +255,7 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
n=`expr $n + 1`
echo_i "check expire option returned from slave zone ($n)"
echo_i "check expire option returned from secondary zone ($n)"
ret=0
$DIG @10.53.0.2 -p ${PORT} +expire soa expire-test > dig.out.expire
grep EXPIRE: dig.out.expire > /dev/null || ret=1

4
bin/tests/system/case/ns1/named.conf.in
View file

@ -25,13 +25,13 @@ options {
};
zone "example" {
type master;
type primary;
file "example.db";
also-notify { 10.53.0.2; };
};
zone "dynamic" {
type master;
type primary;
file "dynamic.db";
allow-update { any; };
also-notify { 10.53.0.2; };

8
bin/tests/system/case/ns2/named.conf.in
View file

@ -26,13 +26,13 @@ options {
};
zone "example" {
type slave;
type secondary;
file "example.bk";
masters { 10.53.0.1; };
primaries { 10.53.0.1; };
};
zone "dynamic" {
type slave;
type secondary;
file "dynamic.bk";
masters { 10.53.0.1; };
primaries { 10.53.0.1; };
};

4
bin/tests/system/case/tests.sh
View file

@ -106,7 +106,7 @@ test $ret -eq 0 || echo_i "failed"
status=`expr $status + $ret`
n=`expr $n + 1`
echo_i "check SOA owner case is transferred to slave ($n)"
echo_i "check SOA owner case is transferred to secondary ($n)"
ret=0
$DIG $DIGOPTS axfr dynamic @10.53.0.2 > dig.ns2.test$n
digcomp dig.ns2.test$n postupdate.good || ret=1
@ -138,7 +138,7 @@ test $ret -eq 0 || echo_i "failed"
status=`expr $status + $ret`
n=`expr $n + 1`
echo_i "check A owner case is transferred to slave ($n)"
echo_i "check A owner case is transferred to secondary ($n)"
ret=0
$DIG $DIGOPTS axfr dynamic @10.53.0.2 > dig.ns2.test$n
digcomp dig.ns2.test$n postns1.good || ret=1

6
bin/tests/system/catz/ns1/named.conf.in
View file

@ -31,7 +31,7 @@ options {
};
zone "catalog1.example" {
type master;
type primary;
file "catalog1.example.db";
allow-transfer { any; };
allow-update { any; };
@ -40,7 +40,7 @@ zone "catalog1.example" {
};
zone "catalog3.example" {
type master;
type primary;
file "catalog3.example.db";
allow-transfer { any; };
allow-update { any; };
@ -49,7 +49,7 @@ zone "catalog3.example" {
};
zone "catalog4.example" {
type master;
type primary;
file "catalog4.example.db";
allow-transfer { any; };
allow-update { any; };

16
bin/tests/system/catz/ns2/named.conf.in
View file

@ -45,27 +45,27 @@ options {
};
zone "catalog1.example" {
type slave;
type secondary;
file "catalog1.example.db";
masters { 10.53.0.1; };
primaries { 10.53.0.1; };
};
zone "catalog2.example" {
type slave;
type secondary;
file "catalog2.example.db";
masters { 10.53.0.3; };
primaries { 10.53.0.3; };
};
zone "catalog3.example" {
type slave;
type secondary;
file "catalog3.example.db";
masters { 10.53.0.1; };
primaries { 10.53.0.1; };
};
zone "catalog4.example" {
type slave;
type secondary;
file "catalog4.example.db";
masters { 10.53.0.1; };
primaries { 10.53.0.1; };
};
key tsig_key. {

6
bin/tests/system/catz/ns3/named.conf.in
View file

@ -30,7 +30,7 @@ options {
};
zone "catalog2.example" {
type master;
type primary;
file "catalog2.example.db";
allow-transfer { any; };
allow-update { any; };
@ -39,7 +39,7 @@ zone "catalog2.example" {
};
zone "dom5.example" {
type master;
type primary;
file "dom5.example.db";
allow-transfer { any; };
allow-update { any; };
@ -47,7 +47,7 @@ zone "dom5.example" {
};
zone "dom6.example" {
type master;
type primary;
file "dom6.example.db";
allow-transfer { any; };
allow-update { any; };

246
bin/tests/system/catz/tests.sh
View file

@ -82,23 +82,23 @@ n=0
##########################################################################
echo_i "Testing adding/removing of domain in catalog zone"
n=$((n+1))
echo_i "checking that dom1.example. is not served by master ($n)"
echo_i "checking that dom1.example. is not served by primary ($n)"
ret=0
wait_for_no_soa @10.53.0.1 dom1.example. dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "Adding a domain dom1.example. to master via RNDC ($n)"
echo_i "Adding a domain dom1.example. to primary via RNDC ($n)"
ret=0
echo "@ 3600 IN SOA . . 1 3600 3600 3600 3600" > ns1/dom1.example.db
echo "@ IN NS invalid." >> ns1/dom1.example.db
rndccmd 10.53.0.1 addzone dom1.example. '{type master; file "dom1.example.db";};' || ret=1
rndccmd 10.53.0.1 addzone dom1.example. '{type primary; file "dom1.example.db";};' || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "checking that dom1.example. is now served by master ($n)"
echo_i "checking that dom1.example. is now served by primary ($n)"
ret=0
wait_for_soa @10.53.0.1 dom1.example. dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
@ -118,7 +118,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "waiting for slave to sync up ($n)"
echo_i "waiting for secondary to sync up ($n)"
ret=0
wait_for_message ns2/named.run "catz: adding zone 'dom1.example' from catalog 'catalog1.example'" &&
wait_for_message ns2/named.run "transfer of 'dom1.example/IN' from 10.53.0.1#${PORT}: Transfer status: success" || ret=1
@ -126,7 +126,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "checking that dom1.example. is served by slave ($n)"
echo_i "checking that dom1.example. is served by secondary ($n)"
ret=0
wait_for_soa @10.53.0.2 dom1.example. dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
@ -151,14 +151,14 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "waiting for slave to sync up ($n)"
echo_i "waiting for secondary to sync up ($n)"
ret=0
wait_for_message ns2/named.run "zone_shutdown: zone dom1.example/IN: shutting down" || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "checking that dom1.example. is not served by slave ($n)"
echo_i "checking that dom1.example. is not served by secondary ($n)"
ret=0
wait_for_no_soa @10.53.0.2 dom1.example. dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
@ -174,20 +174,20 @@ status=$((status+ret))
##########################################################################
echo_i "Testing various simple operations on domains, including using multiple catalog zones and garbage in zone"
n=$((n+1))
echo_i "adding domain dom2.example. to master via RNDC ($n)"
echo_i "adding domain dom2.example. to primary via RNDC ($n)"
ret=0
echo "@ 3600 IN SOA . . 1 3600 3600 3600 3600" > ns1/dom2.example.db
echo "@ IN NS invalid." >> ns1/dom2.example.db
rndccmd 10.53.0.1 addzone dom2.example. '{type master; file "dom2.example.db";};' || ret=1
rndccmd 10.53.0.1 addzone dom2.example. '{type primary; file "dom2.example.db";};' || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "adding domain dom4.example. to master via RNDC ($n)"
echo_i "adding domain dom4.example. to primary via RNDC ($n)"
ret=0
echo "@ 3600 IN SOA . . 1 3600 3600 3600 3600" > ns1/dom4.example.db
echo "@ IN NS invalid." >> ns1/dom4.example.db
rndccmd 10.53.0.1 addzone dom4.example. '{type master; file "dom4.example.db";};' || ret=1
rndccmd 10.53.0.1 addzone dom4.example. '{type primary; file "dom4.example.db";};' || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
@ -226,7 +226,7 @@ status=$((status+ret))
n=$((n+1))
echo_i "waiting for slave to sync up ($n)"
echo_i "waiting for secondary to sync up ($n)"
ret=0
wait_for_message ns2/named.run "catz: adding zone 'dom4.example' from catalog 'catalog2.example'" &&
wait_for_message ns2/named.run "transfer of 'dom4.example/IN' from 10.53.0.1#${EXTRAPORT1}: Transfer status: success" || ret=1
@ -234,7 +234,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "checking that dom4.example. is served by slave ($n)"
echo_i "checking that dom4.example. is served by secondary ($n)"
ret=0
wait_for_soa @10.53.0.2 dom4.example. dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
@ -242,30 +242,30 @@ status=$((status+ret))
n=$((n+1))
echo_i "checking that dom3.example. is not served by master ($n)"
echo_i "checking that dom3.example. is not served by primary ($n)"
ret=0
wait_for_no_soa @10.53.0.1 dom3.example. dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "adding a domain dom3.example. to master via RNDC ($n)"
echo_i "adding a domain dom3.example. to primary via RNDC ($n)"
ret=0
echo "@ 3600 IN SOA . . 1 3600 3600 3600 3600" > ns1/dom3.example.db
echo "@ IN NS invalid." >> ns1/dom3.example.db
rndccmd 10.53.0.1 addzone dom3.example. '{type master; file "dom3.example.db"; also-notify { 10.53.0.2; }; notify explicit; };' || ret=1
rndccmd 10.53.0.1 addzone dom3.example. '{type primary; file "dom3.example.db"; also-notify { 10.53.0.2; }; notify explicit; };' || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "checking that dom3.example. is served by master ($n)"
echo_i "checking that dom3.example. is served by primary ($n)"
ret=0
wait_for_soa @10.53.0.1 dom3.example. dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "waiting for slave to sync up ($n)"
echo_i "waiting for secondary to sync up ($n)"
ret=0
wait_for_message ns2/named.run "catz: adding zone 'dom2.example' from catalog 'catalog1.example'" &&
wait_for_message ns2/named.run "catz: adding zone 'dom3.example' from catalog 'catalog1.example'" &&
@ -275,7 +275,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "checking that dom3.example. is served by slave ($n)"
echo_i "checking that dom3.example. is served by secondary ($n)"
ret=0
wait_for_soa @10.53.0.2 dom3.example. dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
@ -329,7 +329,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "waiting for slave to sync up ($n)"
echo_i "waiting for secondary to sync up ($n)"
ret=0
wait_for_message ns2/named.run "catz: adding zone 'dom5.example' from catalog 'catalog1.example'" &&
wait_for_message ns2/named.run "transfer of 'dom5.example/IN' from 10.53.0.3#${PORT}: Transfer status: success" || ret=1
@ -337,7 +337,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "checking that dom5.example. is served by slave ($n)"
echo_i "checking that dom5.example. is served by secondary ($n)"
ret=0
wait_for_soa @10.53.0.2 dom5.example. dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
@ -356,14 +356,14 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "waiting for slave to sync up ($n)"
echo_i "waiting for secondary to sync up ($n)"
ret=0
wait_for_message ns2/named.run "zone_shutdown: zone dom5.example/IN: shutting down" || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "checking that dom5.example. is no longer served by slave ($n)"
echo_i "checking that dom5.example. is no longer served by secondary ($n)"
ret=0
wait_for_no_soa @10.53.0.2 dom5.example. dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
@ -386,7 +386,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "waiting for slave to sync up ($n)"
echo_i "waiting for secondary to sync up ($n)"
ret=0
wait_for_message ns2/named.run "catz: adding zone 'dom6.example' from catalog 'catalog1.example'" &&
wait_for_message ns2/named.run "transfer of 'dom6.example/IN' from " > /dev/null || ret=1
@ -394,7 +394,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "checking that dom6.example. is served by slave ($n)"
echo_i "checking that dom6.example. is served by secondary ($n)"
ret=0
wait_for_soa @10.53.0.2 dom6.example. dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
@ -414,14 +414,14 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "waiting for slave to sync up ($n)"
echo_i "waiting for secondary to sync up ($n)"
ret=0
wait_for_message ns2/named.run "zone_shutdown: zone dom6.example/IN: shutting down" || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "checking that dom6.example. is no longer served by slave ($n)"
echo_i "checking that dom6.example. is no longer served by secondary ($n)"
ret=0
wait_for_no_soa @10.53.0.2 dom6.example. dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
@ -442,7 +442,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "waiting for slave to sync up ($n)"
echo_i "waiting for secondary to sync up ($n)"
ret=0
wait_for_message ns2/named.run "catz: adding zone 'dom6.example' from catalog 'catalog1.example'" &&
wait_for_message ns2/named.run "error \"failure\" while trying to generate config for zone \"dom6.example\"" || ret=1
@ -462,7 +462,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "waiting for slave to sync up ($n)"
echo_i "waiting for secondary to sync up ($n)"
ret=0
wait_for_message ns2/named.run "catz: deleting zone 'dom6.example' from catalog 'catalog1.example' - success" > /dev/null || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
@ -479,21 +479,21 @@ status=$((status+ret))
##########################################################################
echo_i "Testing allow-query and allow-transfer ACLs"
n=$((n+1))
echo_i "adding domains dom7.example. and dom8.example. to master via RNDC ($n)"
echo_i "adding domains dom7.example. and dom8.example. to primary via RNDC ($n)"
ret=0
echo "@ 3600 IN SOA . . 1 3600 3600 3600 3600" > ns1/dom7.example.db
echo "@ IN NS invalid." >> ns1/dom7.example.db
rndccmd 10.53.0.1 addzone dom7.example. '{type master; file "dom7.example.db";};' || ret=1
rndccmd 10.53.0.1 addzone dom7.example. '{type primary; file "dom7.example.db";};' || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
echo "@ 3600 IN SOA . . 1 3600 3600 3600 3600" > ns1/dom8.example.db
echo "@ IN NS invalid." >> ns1/dom8.example.db
rndccmd 10.53.0.1 addzone dom8.example. '{type master; file "dom8.example.db";};' || ret=1
rndccmd 10.53.0.1 addzone dom8.example. '{type primary; file "dom8.example.db";};' || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "checking that dom7.example. is now served by master ($n)"
echo_i "checking that dom7.example. is now served by primary ($n)"
ret=0
wait_for_soa @10.53.0.1 dom7.example. dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
@ -514,7 +514,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "waiting for slave to sync up ($n)"
echo_i "waiting for secondary to sync up ($n)"
ret=0
wait_for_message ns2/named.run "catz: adding zone 'dom7.example' from catalog 'catalog1.example'" > /dev/null &&
wait_for_message ns2/named.run "transfer of 'dom7.example/IN' from 10.53.0.1#${PORT}: Transfer status: success" || ret=1
@ -557,7 +557,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "waiting for slave to sync up ($n)"
echo_i "waiting for secondary to sync up ($n)"
ret=0
wait_for_message ns2/named.run "catz: update_from_db: new zone merged" &&
wait_for_message ns2/named.run "transfer of 'dom8.example/IN' from 10.53.0.1#${PORT}: Transfer status: success" || ret=1
@ -645,16 +645,16 @@ status=$((status+ret))
##########################################################################
echo_i "Testing TSIG keys for masters set per-domain"
n=$((n+1))
echo_i "adding a domain dom9.example. to master via RNDC, with transfers allowed only with TSIG key ($n)"
echo_i "adding a domain dom9.example. to primary via RNDC, with transfers allowed only with TSIG key ($n)"
ret=0
echo "@ 3600 IN SOA . . 1 3600 3600 3600 3600" > ns1/dom9.example.db
echo "@ IN NS invalid." >> ns1/dom9.example.db
rndccmd 10.53.0.1 addzone dom9.example. '{type master; file "dom9.example.db"; allow-transfer { key tsig_key; }; };' || ret=1
rndccmd 10.53.0.1 addzone dom9.example. '{type primary; file "dom9.example.db"; allow-transfer { key tsig_key; }; };' || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "checking that dom9.example. is now served by master ($n)"
echo_i "checking that dom9.example. is now served by primary ($n)"
ret=0
wait_for_soa @10.53.0.1 dom9.example. dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
@ -676,7 +676,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "waiting for slave to sync up ($n)"
echo_i "waiting for secondary to sync up ($n)"
ret=0
wait_for_message ns2/named.run "catz: adding zone 'dom9.example' from catalog 'catalog1.example'" &&
wait_for_message ns2/named.run "transfer of 'dom9.example/IN' from 10.53.0.1#${PORT}: Transfer status: success" || ret=1
@ -684,7 +684,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "checking that dom9.example. is accessible on slave ($n)"
echo_i "checking that dom9.example. is accessible on secondary ($n)"
ret=0
wait_for_soa @10.53.0.2 dom9.example. dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
@ -704,14 +704,14 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "waiting for slave to sync up ($n)"
echo_i "waiting for secondary to sync up ($n)"
ret=0
wait_for_message ns2/named.run "catz: deleting zone 'dom9.example' from catalog 'catalog1.example' - success" || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "checking that dom9.example. is no longer accessible on slave ($n)"
echo_i "checking that dom9.example. is no longer accessible on secondary ($n)"
ret=0
wait_for_no_soa @10.53.0.2 dom9.example. dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
@ -732,7 +732,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "waiting for slave to sync up ($n)"
echo_i "waiting for secondary to sync up ($n)"
ret=0
wait_for_message ns2/named.run "catz: adding zone 'dom9.example' from catalog 'catalog1.example'" &&
wait_for_message ns2/named.run "error \"failure\" while trying to generate config for zone \"dom9.example\"" || ret=1
@ -752,7 +752,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "waiting for slave to sync up ($n)"
echo_i "waiting for secondary to sync up ($n)"
ret=0
wait_for_message ns2/named.run "catz: deleting zone 'dom9.example' from catalog 'catalog1.example'" || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
@ -791,23 +791,23 @@ do
esac
n=$((n+1))
echo_i "checking that ${special}. is not served by master ($n)"
echo_i "checking that ${special}. is not served by primary ($n)"
ret=0
wait_for_no_soa @10.53.0.1 "${special}" dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "Adding a domain ${special}. to master via RNDC ($n)"
echo_i "Adding a domain ${special}. to primary via RNDC ($n)"
ret=0
echo "@ 3600 IN SOA . . 1 3600 3600 3600 3600" > ns1/dom10.example.db
echo "@ IN NS invalid." >> ns1/dom10.example.db
rndccmd 10.53.0.1 addzone '"'"${special}"'"' '{type master; file "dom10.example.db";};' || ret=1
rndccmd 10.53.0.1 addzone '"'"${special}"'"' '{type primary; file "dom10.example.db";};' || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "checking that ${special}. is now served by master ($n)"
echo_i "checking that ${special}. is now served by primary ($n)"
ret=0
wait_for_soa @10.53.0.1 "${special}." dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
@ -827,7 +827,7 @@ END
status=$((status+ret))
n=$((n+1))
echo_i "waiting for slave to sync up ($n)"
echo_i "waiting for secondary to sync up ($n)"
ret=0
wait_for_message ns2/named.run "catz: adding zone '$special' from catalog 'catalog1.example'" &&
wait_for_message ns2/named.run "transfer of '$special/IN' from 10.53.0.1#${PORT}: Transfer status: success" || ret=1
@ -835,7 +835,7 @@ END
status=$((status+ret))
n=$((n+1))
echo_i "checking that ${special}. is served by slave ($n)"
echo_i "checking that ${special}. is served by secondary ($n)"
ret=0
wait_for_soa @10.53.0.2 "${special}." dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
@ -860,14 +860,14 @@ END
status=$((status+ret))
n=$((n+1))
echo_i "waiting for slave to sync up ($n)"
echo_i "waiting for secondary to sync up ($n)"
ret=0
wait_for_message ns2/named.run "zone_shutdown: zone ${special}/IN: shutting down" || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "checking that ${special}. is not served by slave ($n)"
echo_i "checking that ${special}. is not served by secondary ($n)"
ret=0
wait_for_no_soa @10.53.0.2 "${special}." dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
@ -884,23 +884,23 @@ done
##########################################################################
echo_i "Testing adding a domain and a subdomain of it"
n=$((n+1))
echo_i "checking that dom11.example. is not served by master ($n)"
echo_i "checking that dom11.example. is not served by primary ($n)"
ret=0
wait_for_no_soa @10.53.0.1 dom11.example. dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "Adding a domain dom11.example. to master via RNDC ($n)"
echo_i "Adding a domain dom11.example. to primary via RNDC ($n)"
ret=0
echo "@ 3600 IN SOA . . 1 3600 3600 3600 3600" > ns1/dom11.example.db
echo "@ IN NS invalid." >> ns1/dom11.example.db
rndccmd 10.53.0.1 addzone dom11.example. '{type master; file "dom11.example.db";};' || ret=1
rndccmd 10.53.0.1 addzone dom11.example. '{type primary; file "dom11.example.db";};' || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "checking that dom11.example. is now served by master ($n)"
echo_i "checking that dom11.example. is now served by primary ($n)"
ret=0
wait_for_soa @10.53.0.1 dom11.example. dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
@ -920,7 +920,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "waiting for slave to sync up ($n)"
echo_i "waiting for secondary to sync up ($n)"
ret=0
wait_for_message ns2/named.run "catz: adding zone 'dom11.example' from catalog 'catalog1.example'" &&
wait_for_message ns2/named.run "transfer of 'dom11.example/IN' from 10.53.0.1#${PORT}: Transfer status: success" || ret=1
@ -928,30 +928,30 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "checking that dom11.example. is served by slave ($n)"
echo_i "checking that dom11.example. is served by secondary ($n)"
ret=0
wait_for_soa @10.53.0.2 dom11.example. dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "checking that subdomain.of.dom11.example. is not served by master ($n)"
echo_i "checking that subdomain.of.dom11.example. is not served by primary ($n)"
ret=0
wait_for_rcode NXDOMAIN SOA @10.53.0.1 subdomain.of.dom11.example. dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "Adding a domain subdomain.of.dom11.example. to master via RNDC ($n)"
echo_i "Adding a domain subdomain.of.dom11.example. to primary via RNDC ($n)"
ret=0
echo "@ 3600 IN SOA . . 1 3600 3600 3600 3600" > ns1/subdomain.of.dom11.example.db
echo "@ IN NS invalid." >> ns1/subdomain.of.dom11.example.db
rndccmd 10.53.0.1 addzone subdomain.of.dom11.example. '{type master; file "subdomain.of.dom11.example.db";};' || ret=1
rndccmd 10.53.0.1 addzone subdomain.of.dom11.example. '{type primary; file "subdomain.of.dom11.example.db";};' || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "checking that subdomain.of.dom11.example. is now served by master ($n)"
echo_i "checking that subdomain.of.dom11.example. is now served by primary ($n)"
ret=0
wait_for_soa @10.53.0.1 subdomain.of.dom11.example. dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
@ -971,7 +971,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "waiting for slave to sync up ($n)"
echo_i "waiting for secondary to sync up ($n)"
ret=0
wait_for_message ns2/named.run "catz: adding zone 'subdomain.of.dom11.example' from catalog 'catalog1.example'" &&
wait_for_message ns2/named.run "transfer of 'subdomain.of.dom11.example/IN' from 10.53.0.1#${PORT}: Transfer status: success" || ret=1
@ -979,7 +979,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "checking that subdomain.of.dom11.example. is served by slave ($n)"
echo_i "checking that subdomain.of.dom11.example. is served by secondary ($n)"
ret=0
wait_for_soa @10.53.0.2 subdomain.of.dom11.example. dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
@ -997,21 +997,21 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "waiting for slave to sync up ($n)"
echo_i "waiting for secondary to sync up ($n)"
ret=0
wait_for_message ns2/named.run "zone_shutdown: zone dom11.example/IN: shutting down" || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "checking that dom11.example. is not served by slave ($n)"
echo_i "checking that dom11.example. is not served by secondary ($n)"
ret=0
wait_for_no_soa @10.53.0.2 dom11.example. dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "checking that subdomain.of.dom11.example. is still served by slave ($n)"
echo_i "checking that subdomain.of.dom11.example. is still served by secondary ($n)"
ret=0
wait_for_soa @10.53.0.2 subdomain.of.dom11.example. dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
@ -1029,14 +1029,14 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "waiting for slave to sync up ($n)"
echo_i "waiting for secondary to sync up ($n)"
ret=0
wait_for_message ns2/named.run "zone_shutdown: zone subdomain.of.dom11.example/IN: shutting down" || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "checking that subdomain.of.dom11.example. is not served by slave ($n)"
echo_i "checking that subdomain.of.dom11.example. is not served by secondary ($n)"
ret=0
wait_for_no_soa @10.53.0.2 subdomain.of.d11.example. dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
@ -1045,23 +1045,23 @@ status=$((status+ret))
##########################################################################
echo_i "Testing adding a catalog zone at runtime with rndc reconfig"
n=$((n+1))
echo_i "checking that dom12.example. is not served by master ($n)"
echo_i "checking that dom12.example. is not served by primary ($n)"
ret=0
wait_for_no_soa @10.53.0.1 dom12.example. dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "Adding a domain dom12.example. to master via RNDC ($n)"
echo_i "Adding a domain dom12.example. to primary via RNDC ($n)"
ret=0
echo "@ 3600 IN SOA . . 1 3600 3600 3600 3600" > ns1/dom12.example.db
echo "@ IN NS invalid." >> ns1/dom12.example.db
rndccmd 10.53.0.1 addzone dom12.example. '{type master; file "dom12.example.db";};' || ret=1
rndccmd 10.53.0.1 addzone dom12.example. '{type primary; file "dom12.example.db";};' || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "checking that dom12.example. is now served by master ($n)"
echo_i "checking that dom12.example. is now served by primary ($n)"
ret=0
wait_for_soa @10.53.0.1 dom12.example. dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
@ -1081,7 +1081,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "checking that dom12.example. is not served by slave ($n)"
echo_i "checking that dom12.example. is not served by secondary ($n)"
ret=0
wait_for_no_soa @10.53.0.2 dom12.example. dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
@ -1089,7 +1089,7 @@ status=$((status+ret))
n=$((n+1))
echo_i "reconfiguring slave - adding catalog4 catalog zone ($n)"
echo_i "reconfiguring secondary - adding catalog4 catalog zone ($n)"
ret=0
sed -e "s/^#T1//g" < ns2/named.conf.in > ns2/named.conf.tmp
copy_setports ns2/named.conf.tmp ns2/named.conf
@ -1098,7 +1098,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "waiting for slave to sync up ($n)"
echo_i "waiting for secondary to sync up ($n)"
ret=0
wait_for_message ns2/named.run "catz: adding zone 'dom12.example' from catalog 'catalog4.example'" &&
wait_for_message ns2/named.run "transfer of 'dom12.example/IN' from 10.53.0.1#${PORT}: Transfer status: success" || ret=1
@ -1106,21 +1106,21 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "checking that dom7.example. is still served by slave after reconfiguration ($n)"
echo_i "checking that dom7.example. is still served by secondary after reconfiguration ($n)"
ret=0
wait_for_soa @10.53.0.2 dom7.example. dig.out.test$n -b 10.53.0.1 || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "checking that dom12.example. is served by slave ($n)"
echo_i "checking that dom12.example. is served by secondary ($n)"
ret=0
wait_for_soa @10.53.0.2 dom12.example. dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "reconfiguring slave - removing catalog4 catalog zone, adding non-existent catalog5 catalog zone ($n)"
echo_i "reconfiguring secondary - removing catalog4 catalog zone, adding non-existent catalog5 catalog zone ($n)"
ret=0
sed -e "s/^#T2//" < ns2/named.conf.in > ns2/named.conf.tmp
copy_setports ns2/named.conf.tmp ns2/named.conf
@ -1129,7 +1129,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "reconfiguring slave - removing non-existent catalog5 catalog zone ($n)"
echo_i "reconfiguring secondary - removing non-existent catalog5 catalog zone ($n)"
ret=0
copy_setports ns2/named.conf.in ns2/named.conf
rndccmd 10.53.0.2 reconfig || ret=1
@ -1137,7 +1137,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "checking that dom12.example. is not served by slave ($n)"
echo_i "checking that dom12.example. is not served by secondary ($n)"
ret=0
wait_for_no_soa @10.53.0.2 dom12.example. dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
@ -1157,41 +1157,41 @@ status=$((status+ret))
##########################################################################
echo_i "Testing having a zone in two different catalogs"
n=$((n+1))
echo_i "checking that dom13.example. is not served by master ($n)"
echo_i "checking that dom13.example. is not served by primary ($n)"
ret=0
wait_for_no_soa @10.53.0.1 dom13.example. dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "Adding a domain dom13.example. to master ns1 via RNDC ($n)"
echo_i "Adding a domain dom13.example. to primary ns1 via RNDC ($n)"
ret=0
echo "@ 3600 IN SOA . . 1 3600 3600 3600 3600" > ns1/dom13.example.db
echo "@ IN NS invalid." >> ns1/dom13.example.db
echo "@ IN A 192.0.2.1" >> ns1/dom13.example.db
rndccmd 10.53.0.1 addzone dom13.example. '{type master; file "dom13.example.db";};' || ret=1
rndccmd 10.53.0.1 addzone dom13.example. '{type primary; file "dom13.example.db";};' || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "checking that dom13.example. is now served by master ns1 ($n)"
echo_i "checking that dom13.example. is now served by primary ns1 ($n)"
ret=0
wait_for_soa @10.53.0.1 dom13.example. dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "Adding a domain dom13.example. to master ns3 via RNDC ($n)"
echo_i "Adding a domain dom13.example. to primary ns3 via RNDC ($n)"
ret=0
echo "@ 3600 IN SOA . . 1 3600 3600 3600 3600" > ns3/dom13.example.db
echo "@ IN NS invalid." >> ns3/dom13.example.db
echo "@ IN A 192.0.2.2" >> ns3/dom13.example.db
rndccmd 10.53.0.3 addzone dom13.example. '{type master; file "dom13.example.db";};' || ret=1
rndccmd 10.53.0.3 addzone dom13.example. '{type primary; file "dom13.example.db";};' || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "checking that dom13.example. is now served by master ns3 ($n)"
echo_i "checking that dom13.example. is now served by primary ns3 ($n)"
ret=0
wait_for_soa @10.53.0.3 dom13.example. dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
@ -1201,7 +1201,7 @@ status=$((status+ret))
nextpart ns2/named.run >/dev/null
n=$((n+1))
echo_i "Adding domain dom13.example. to catalog1 zone with ns1 as master ($n)"
echo_i "Adding domain dom13.example. to catalog1 zone with ns1 as primary ($n)"
ret=0
$NSUPDATE -d <<END >> nsupdate.out.test$n 2>&1 || ret=1
server 10.53.0.1 ${PORT}
@ -1213,7 +1213,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "waiting for slave to sync up ($n)"
echo_i "waiting for secondary to sync up ($n)"
ret=0
wait_for_message ns2/named.run "catz: adding zone 'dom13.example' from catalog 'catalog1.example'" &&
wait_for_message ns2/named.run "transfer of 'dom13.example/IN' from 10.53.0.1#${PORT}: Transfer status: success" || ret=1
@ -1223,7 +1223,7 @@ status=$((status+ret))
nextpart ns2/named.run >/dev/null
n=$((n+1))
echo_i "checking that dom13.example. is served by slave and that it's the one from ns1 ($n)"
echo_i "checking that dom13.example. is served by secondary and that it's the one from ns1 ($n)"
ret=0
wait_for_a @10.53.0.2 dom13.example. dig.out.test$n || ret=1
grep "192.0.2.1" dig.out.test$n > /dev/null || ret=1
@ -1231,7 +1231,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "Adding domain dom13.example. to catalog2 zone with ns3 as master ($n)"
echo_i "Adding domain dom13.example. to catalog2 zone with ns3 as primary ($n)"
ret=0
$NSUPDATE -d <<END >> nsupdate.out.test$n 2>&1 || ret=1
server 10.53.0.3 ${PORT}
@ -1243,14 +1243,14 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "waiting for slave to sync up ($n)"
echo_i "waiting for secondary to sync up ($n)"
ret=0
wait_for_message ns2/named.run "catz: update_from_db: new zone merged" || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "checking that dom13.example. is served by slave and that it's still the one from ns1 ($n)"
echo_i "checking that dom13.example. is served by secondary and that it's still the one from ns1 ($n)"
ret=0
wait_for_a @10.53.0.2 dom13.example. dig.out.test$n || ret=1
grep "192.0.2.1" dig.out.test$n > /dev/null || ret=1
@ -1272,14 +1272,14 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "waiting for slave to sync up ($n)"
echo_i "waiting for secondary to sync up ($n)"
ret=0
wait_for_message ns2/named.run "catz: update_from_db: new zone merged" || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "checking that dom13.example. is served by slave and that it's still the one from ns1 ($n)"
echo_i "checking that dom13.example. is served by secondary and that it's still the one from ns1 ($n)"
ret=0
wait_for_a @10.53.0.2 dom13.example. dig.out.test$n || ret=1
grep "192.0.2.1" dig.out.test$n > /dev/null || ret=1
@ -1299,14 +1299,14 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "waiting for slave to sync up ($n)"
echo_i "waiting for secondary to sync up ($n)"
ret=0
wait_for_message ns2/named.run "catz: update_from_db: new zone merged" || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "checking that dom13.example. is no longer served by slave ($n)"
echo_i "checking that dom13.example. is no longer served by secondary ($n)"
ret=0
wait_for_no_soa @10.53.0.2 dom13.example. dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
@ -1315,41 +1315,41 @@ status=$((status+ret))
##########################################################################
echo_i "Testing having a regular zone and a zone in catalog zone of the same name"
n=$((n+1))
echo_i "checking that dom14.example. is not served by master ($n)"
echo_i "checking that dom14.example. is not served by primary ($n)"
ret=0
wait_for_no_soa @10.53.0.1 dom14.example. dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "Adding a domain dom14.example. to master ns1 via RNDC ($n)"
echo_i "Adding a domain dom14.example. to primary ns1 via RNDC ($n)"
ret=0
echo "@ 3600 IN SOA . . 1 3600 3600 3600 3600" > ns1/dom14.example.db
echo "@ IN NS invalid." >> ns1/dom14.example.db
echo "@ IN A 192.0.2.1" >> ns1/dom14.example.db
rndccmd 10.53.0.1 addzone dom14.example. '{type master; file "dom14.example.db";};' || ret=1
rndccmd 10.53.0.1 addzone dom14.example. '{type primary; file "dom14.example.db";};' || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "checking that dom14.example. is now served by master ns1 ($n)"
echo_i "checking that dom14.example. is now served by primary ns1 ($n)"
ret=0
wait_for_soa @10.53.0.1 dom14.example. dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "Adding a domain dom14.example. to master ns3 via RNDC ($n)"
echo_i "Adding a domain dom14.example. to primary ns3 via RNDC ($n)"
ret=0
echo "@ 3600 IN SOA . . 1 3600 3600 3600 3600" > ns3/dom14.example.db
echo "@ IN NS invalid." >> ns3/dom14.example.db
echo "@ IN A 192.0.2.2" >> ns3/dom14.example.db
rndccmd 10.53.0.3 addzone dom14.example. '{type master; file "dom14.example.db";};' || ret=1
rndccmd 10.53.0.3 addzone dom14.example. '{type primary; file "dom14.example.db";};' || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "checking that dom14.example. is now served by master ns3 ($n)"
echo_i "checking that dom14.example. is now served by primary ns3 ($n)"
ret=0
wait_for_soa @10.53.0.3 dom14.example. dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
@ -1358,14 +1358,14 @@ status=$((status+ret))
nextpart ns2/named.run >/dev/null
n=$((n+1))
echo_i "Adding domain dom14.example. with rndc with ns1 as master ($n)"
echo_i "Adding domain dom14.example. with rndc with ns1 as primary ($n)"
ret=0
rndccmd 10.53.0.2 addzone dom14.example. '{type slave; masters {10.53.0.1;};};' || ret=1
rndccmd 10.53.0.2 addzone dom14.example. '{type secondary; primaries {10.53.0.1;};};' || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "waiting for slave to sync up ($n)"
echo_i "waiting for secondary to sync up ($n)"
ret=0
wait_for_message ns2/named.run "transfer of 'dom14.example/IN' from 10.53.0.1#${PORT}: Transfer status: success" || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
@ -1374,7 +1374,7 @@ status=$((status+ret))
nextpart ns2/named.run >/dev/null
n=$((n+1))
echo_i "checking that dom14.example. is served by slave and that it's the one from ns1 ($n)"
echo_i "checking that dom14.example. is served by secondary and that it's the one from ns1 ($n)"
ret=0
wait_for_a @10.53.0.2 dom14.example. dig.out.test$n || ret=1
grep "192.0.2.1" dig.out.test$n > /dev/null || ret=1
@ -1382,7 +1382,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "Adding domain dom14.example. to catalog2 zone with ns3 as master ($n)"
echo_i "Adding domain dom14.example. to catalog2 zone with ns3 as primary ($n)"
ret=0
$NSUPDATE -d <<END >> nsupdate.out.test$n 2>&1 || ret=1
server 10.53.0.3 ${PORT}
@ -1394,14 +1394,14 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "waiting for slave to sync up ($n)"
echo_i "waiting for secondary to sync up ($n)"
ret=0
wait_for_message ns2/named.run "catz: update_from_db: new zone merged" || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "checking that dom14.example. is served by slave and that it's still the one from ns1 ($n)"
echo_i "checking that dom14.example. is served by secondary and that it's still the one from ns1 ($n)"
ret=0
wait_for_a @10.53.0.2 dom14.example. dig.out.test$n || ret=1
grep "192.0.2.1" dig.out.test$n > /dev/null || ret=1
@ -1423,14 +1423,14 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "waiting for slave to sync up ($n)"
echo_i "waiting for secondary to sync up ($n)"
ret=0
wait_for_message ns2/named.run "catz: update_from_db: new zone merged" || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "checking that dom14.example. is served by slave and that it's still the one from ns1 ($n)"
echo_i "checking that dom14.example. is served by secondary and that it's still the one from ns1 ($n)"
ret=0
wait_for_a @10.53.0.2 dom14.example. dig.out.test$n || ret=1
grep "192.0.2.1" dig.out.test$n > /dev/null || ret=1
@ -1440,23 +1440,23 @@ status=$((status+ret))
##########################################################################
echo_i "Testing changing label for a member zone"
n=$((n+1))
echo_i "checking that dom15.example. is not served by master ($n)"
echo_i "checking that dom15.example. is not served by primary ($n)"
ret=0
wait_for_no_soa @10.53.0.1 dom15.example. dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "Adding a domain dom15.example. to master ns1 via RNDC ($n)"
echo_i "Adding a domain dom15.example. to primary ns1 via RNDC ($n)"
ret=0
echo "@ 3600 IN SOA . . 1 3600 3600 3600 3600" > ns1/dom15.example.db
echo "@ IN NS invalid." >> ns1/dom15.example.db
rndccmd 10.53.0.1 addzone dom15.example. '{type master; file "dom15.example.db";};' || ret=1
rndccmd 10.53.0.1 addzone dom15.example. '{type primary; file "dom15.example.db";};' || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "checking that dom15.example. is now served by master ns1 ($n)"
echo_i "checking that dom15.example. is now served by primary ns1 ($n)"
ret=0
wait_for_soa @10.53.0.1 dom15.example. dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
@ -1475,7 +1475,7 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "waiting for slave to sync up ($n)"
echo_i "waiting for secondary to sync up ($n)"
ret=0
wait_for_message ns2/named.run "catz: update_from_db: new zone merged" || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
@ -1484,7 +1484,7 @@ status=$((status+ret))
sleep 3
n=$((n+1))
echo_i "checking that dom15.example. is served by slave ($n)"
echo_i "checking that dom15.example. is served by secondary ($n)"
ret=0
wait_for_soa @10.53.0.2 dom15.example. dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
@ -1505,14 +1505,14 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "waiting for slave to sync up ($n)"
echo_i "waiting for secondary to sync up ($n)"
ret=0
wait_for_message ns2/named.run "catz: update_from_db: new zone merged" || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "checking that dom15.example. is served by slave ($n)"
echo_i "checking that dom15.example. is served by secondary ($n)"
ret=0
wait_for_soa @10.53.0.2 dom15.example. dig.out.test$n || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi

2
bin/tests/system/chain/ns1/named.conf.in
View file

@ -22,4 +22,4 @@ options {
notify yes;
};
zone "." { type master; file "root.db"; };
zone "." { type primary; file "root.db"; };

26
bin/tests/system/chain/ns2/named.conf.in
View file

@ -25,28 +25,28 @@ options {
};
zone "example" {
type master;
type primary;
file "example.db.signed";
allow-update { any; };
};
zone "sub2.example" {
type master;
type primary;
file "sub.db";
};
zone "signed-sub2.example" {
type master;
type primary;
file "sub.db";
};
zone "domain0.nil" { type master; file "generic.db"; };
zone "domain1.nil" { type master; file "generic.db"; };
zone "domain2.nil" { type master; file "generic.db"; };
zone "domain3.nil" { type master; file "generic.db"; };
zone "domain4.nil" { type master; file "generic.db"; };
zone "domain5.nil" { type master; file "generic.db"; };
zone "domain6.nil" { type master; file "generic.db"; };
zone "domain7.nil" { type master; file "generic.db"; };
zone "domain8.nil" { type master; file "generic.db"; };
zone "domain9.nil" { type master; file "generic.db"; };
zone "domain0.nil" { type primary; file "generic.db"; };
zone "domain1.nil" { type primary; file "generic.db"; };
zone "domain2.nil" { type primary; file "generic.db"; };
zone "domain3.nil" { type primary; file "generic.db"; };
zone "domain4.nil" { type primary; file "generic.db"; };
zone "domain5.nil" { type primary; file "generic.db"; };
zone "domain6.nil" { type primary; file "generic.db"; };
zone "domain7.nil" { type primary; file "generic.db"; };
zone "domain8.nil" { type primary; file "generic.db"; };
zone "domain9.nil" { type primary; file "generic.db"; };

4
bin/tests/system/chain/ns5/named.conf.in
View file

@ -30,11 +30,11 @@ zone "." {
};
zone "sub5.example" {
type master;
type primary;
file "sub.db";
};
zone "signed-sub5.example" {
type master;
type primary;
file "sub.db";
};

13
bin/tests/system/checkconf/bad-duplicate-primaries-1.conf Normal file
View file

@ -0,0 +1,13 @@
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* See the COPYRIGHT file distributed with this work for additional
* information regarding copyright ownership.
*/
primaries duplicate { 1.2.3.4; };
primaries duplicate { 4.3.2.1; };

13
bin/tests/system/checkconf/bad-duplicate-primaries-2.conf Normal file
View file

@ -0,0 +1,13 @@
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* See the COPYRIGHT file distributed with this work for additional
* information regarding copyright ownership.
*/
masters duplicate { 1.2.3.4; };
primaries duplicate { 4.3.2.1; };

16
bin/tests/system/checkconf/bad-masters-dup.conf Normal file
View file

@ -0,0 +1,16 @@
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* See the COPYRIGHT file distributed with this work for additional
* information regarding copyright ownership.
*/
zone "example.net" {
type secondary;
primaries { 192.168.1.1; };
masters { 192.168.1.2; };
};

13
bin/tests/system/checkconf/good-masters-and-primaries.conf Normal file
View file

@ -0,0 +1,13 @@
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* See the COPYRIGHT file distributed with this work for additional
* information regarding copyright ownership.
*/
masters a { 1.2.3.4; };
primaries b { 1.2.3.4; };

1
bin/tests/system/checkconf/good.conf
View file

@ -165,6 +165,7 @@ view "third" {
masters {
1.2.3.4;
};
notify primary-only;
};
};
view "fourth" {

8
bin/tests/system/checkconf/tests.sh
View file

@ -182,8 +182,8 @@ EOF
[ $? -eq 1 ] || { echo_i "options + view $field failed" ; ret=1; }
cat > badzero.conf << EOF
zone dummy {
type slave;
masters { 0.0.0.0; };
type secondary;
primaries { 0.0.0.0; };
$field 0;
};
EOF
@ -194,7 +194,7 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
n=`expr $n + 1`
echo_i "checking options allowed in inline-signing slaves ($n)"
echo_i "checking options allowed in inline-signing secondaries ($n)"
ret=0
$CHECKCONF bad-dnssec.conf > checkconf.out$n.1 2>&1
l=`grep "dnssec-dnskey-kskonly.*requires inline" < checkconf.out$n.1 | wc -l`
@ -209,7 +209,7 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
n=`expr $n + 1`
echo_i "check file + inline-signing for slave zones ($n)"
echo_i "check file + inline-signing for secondary zones ($n)"
$CHECKCONF inline-no.conf > checkconf.out$n.1 2>&1
l=`grep "missing 'file' entry" < checkconf.out$n.1 | wc -l`
[ $l -eq 0 ] || ret=1

14
bin/tests/system/checknames/ns1/named.conf.in
View file

@ -24,44 +24,44 @@ options {
};
zone "." {
type master;
type primary;
file "root.db";
};
zone "ignore.example" {
type master;
type primary;
file "ignore.example.db";
check-names ignore;
};
zone "warn.example" {
type master;
type primary;
file "warn.example.db";
check-names warn;
};
zone "fail.example" {
type master;
type primary;
file "fail.example.db";
check-names fail;
};
zone "ignore.update" {
type master;
type primary;
file "ignore.update.db";
allow-update { any; };
check-names ignore;
};
zone "warn.update" {
type master;
type primary;
file "warn.update.db";
allow-update { any; };
check-names warn;
};
zone "fail.update" {
type master;
type primary;
file "fail.update.db";
allow-update { any; };
check-names fail;

2
bin/tests/system/checknames/ns4/named.conf.in
View file

@ -29,7 +29,7 @@ zone "." {
};
zone "master-ignore.update" {
type master;
type primary;
file "master-ignore.update.db";
allow-update { any; };
};

2
bin/tests/system/cookie/ns1/named.conf.in
View file

@ -53,6 +53,6 @@ zone "." {
};
zone "example" {
type master;
type primary;
file "example.db";
};

2
bin/tests/system/cookie/ns2/named.conf.in
View file

@ -24,6 +24,6 @@ options {
};
zone "." {
type master;
type primary;
file "root.db";
};

2
bin/tests/system/cookie/ns3/named.conf.in
View file

@ -45,6 +45,6 @@ zone "." {
};
zone "example" {
type master;
type primary;
file "example.db";
};

2
bin/tests/system/cookie/ns7/named.conf.in
View file

@ -24,6 +24,6 @@ options {
};
zone "." {
type master;
type primary;
file "root.db";
};

2
bin/tests/system/cookie/ns8/named.conf.in
View file

@ -32,6 +32,6 @@ options {
};
zone "example" {
type master;
type primary;
file "example.db";
};

2
bin/tests/system/database/ns1/named1.conf.in
View file

@ -34,6 +34,6 @@ options {
};
zone "database" {
type master;
type primary;
database "_builtin empty localhost. hostmaster.isc.org.";
};

2
bin/tests/system/database/ns1/named2.conf.in
View file

@ -34,6 +34,6 @@ options {
};
zone "database" {
type master;
type primary;
database "_builtin empty localhost. marka.isc.org.";
};

2
bin/tests/system/delzone/clean.sh
View file

@ -17,7 +17,7 @@ rm -f ns2/*.nzd ns2/*nzd-lock
rm -f ns2/core*
rm -f ns2/inline.db.jbk
rm -f ns2/inline.db.signed
rm -f ns2/inlineslave.bk*
rm -f ns2/inlinesec.bk*
rm -f ns*/named.lock
rm -f ns2/nzf-*
rm -f ns*/managed-keys.bind*

2
bin/tests/system/delzone/ns1/inlineslave.db → bin/tests/system/delzone/ns1/inlinesec.db
View file

@ -7,7 +7,7 @@
; See the COPYRIGHT file distributed with this work for additional
; information regarding copyright ownership.
$ORIGIN inlineslave.example.
$ORIGIN inlinesec.example.
$TTL 300 ; 5 minutes
@ IN SOA mname1. . (
1 ; serial

Some files were not shown because too many files have changed in this diff Show more