diff --git a/bin/rndc/rndc.rst b/bin/rndc/rndc.rst index 6221073ae8..1e4625c659 100644 --- a/bin/rndc/rndc.rst +++ b/bin/rndc/rndc.rst @@ -136,7 +136,7 @@ Currently supported commands are: This sample ``addzone`` command adds the zone ``example.com`` to the default view: - ``rndc addzone example.com '{ type master; file "example.com.db"; };'`` + ``rndc addzone example.com '{ type primary; file "example.com.db"; };'`` (Note the brackets around and semi-colon after the zone configuration text.) diff --git a/contrib/dlz/example/README b/contrib/dlz/example/README index f8667ac5d7..d82a0461fd 100644 --- a/contrib/dlz/example/README +++ b/contrib/dlz/example/README @@ -22,8 +22,8 @@ The response is converted to DNS wire format by named. This conversion, and the lack of any internal caching, places significant limits on the query performance of DLZ modules. Consequently, DLZ is not recommended for use on high-volume servers. However, it can be used in a hidden -master configuration, with slaves retrieving zone updates via AXFR. -(Note, however, that DLZ has no built-in support for DNS notify; slaves +primary configuration, with secondaries retrieving zone updates via AXFR. +(Note, however, that DLZ has no built-in support for DNS notify; secondaries are not automatically informed of changes to the zones in the database.) CONFIGURING DLZ: diff --git a/doc/arm/advanced.rst b/doc/arm/advanced.rst index 875d814f1b..70822302d4 100644 --- a/doc/arm/advanced.rst +++ b/doc/arm/advanced.rst @@ -353,7 +353,7 @@ External (bastion host) DNS server configuration: zone "site2.example.com" { type secondary; file "s/site2.foo.com"; - masters { another_bastion_host_maybe; }; + primaries { another_bastion_host_maybe; }; allow-transfer { internals; externals; } }; diff --git a/doc/arm/catz.rst b/doc/arm/catz.rst index 2b03a945a2..29da26467c 100644 --- a/doc/arm/catz.rst +++ b/doc/arm/catz.rst @@ -243,5 +243,5 @@ configuration file. Note that none of the global records for an option are inherited if any records are defined for that option for the specific zone. For example, -if the zone had a ``masters`` record of type A but not AAAA, it +if the zone had a ``primaries`` record of type A but not AAAA, it would *not* inherit the type AAAA record from the global option. diff --git a/doc/arm/configuration.rst b/doc/arm/configuration.rst index 00f9f6b49b..8cce40a553 100644 --- a/doc/arm/configuration.rst +++ b/doc/arm/configuration.rst @@ -96,7 +96,7 @@ the primary server for ``example.com`` and a secondary server for the subdomain type secondary; file "eng.example.com.bk"; // IP address of eng.example.com primary server - masters { 192.168.4.12; }; + primaries { 192.168.4.12; }; }; .. _load_balancing: diff --git a/doc/design/database b/doc/design/database index 8a8fa58ee0..0d711eae0c 100644 --- a/doc/design/database +++ b/doc/design/database @@ -35,8 +35,8 @@ validation status, may change. Database Updates -A master zone is updated by a Dynamic Update message. A slave zone is -updated by IXFR or AXFR. AXFR provides the entire contents of the new +A primary zone is updated by a Dynamic Update message. A secondary zone +is updated by IXFR or AXFR. AXFR provides the entire contents of the new zone version, and replaces the entire contents of the database. IXFR and Dynamic Update, although completely different protocols, have the same basic database requirements. They are differential update diff --git a/doc/design/keydone b/doc/design/keydone index 212d0bde0f..d31fae0189 100644 --- a/doc/design/keydone +++ b/doc/design/keydone @@ -17,7 +17,7 @@ See COPYRIGHT in the source root or https://isc.org/copyright.html for terms. [view]]'. Err: DNS_R_NOTFOUND - zone must be a master (signed inline == master) or normal + zone must be a primary (signed inline == primary) or normal dynamic zone. Err: DNS_R_NOTMASTER diff --git a/doc/design/unsupported-algorithms-in-bind9 b/doc/design/unsupported-algorithms-in-bind9 index ffb258c2cd..d732b122a4 100644 --- a/doc/design/unsupported-algorithms-in-bind9 +++ b/doc/design/unsupported-algorithms-in-bind9 @@ -37,7 +37,7 @@ as it is not used for *signing* that zone. BIND 9 also does not allow unsupported algorithms to be used with `auto-dnssec`: zone "example" IN { - type master; + type primary; file "db/example.db"; key-directory "keys/example"; inline-signing yes; diff --git a/doc/design/zone b/doc/design/zone index 4d12e6680f..5e2e3e10be 100644 --- a/doc/design/zone +++ b/doc/design/zone @@ -15,14 +15,14 @@ Overview * name * class - * master / slave / stub / hint / cache / forward + * primary / secondary / stub / hint / cache / forward * serial number * signed / unsigned - * update periods (refresh / retry) (slave / stub) + * update periods (refresh / retry) (secondary / stub) * last update time (slave / stub) * access restrictions - * transfer restrictions (master / slave) - * update restictions (master / slave) + * transfer restrictions (primary / slave) + * update restictions (primary / slave) * expire period (slave / stub) * children => bottom * glue @@ -30,8 +30,8 @@ Overview * transfer "in" in progress * transfers "out" in progress * "current" check in progress - * our masters - * primary master name (required to auto generate our masters) + * our primaries + * primary server name (required to auto generate our primaries) * master file name * database name * database type @@ -96,7 +96,7 @@ Overview slave setups are continual and ongoing sources of problems in the DNS. Periodic checks to ensure parent and child servers agree on the list of nameservers and that slaves are tracking the changes - made in the master server's zone will allow problems in + made in the primary server's zone will allow problems in configurations to be identified earlier providing for a more stable DNS. @@ -175,7 +175,7 @@ Functions: dns_zone_axfrin(dns_zone_t *zone, isc_sockaddr_t *addr); Initiate transfer of the zone from the given server or the - masters masters listed in the zone structure. + primary servers listed in the zone structure. dns_zone_maintenance(dns_zone_t *zone); @@ -186,15 +186,15 @@ Functions: dns_zone_locateprimary(dns_zone_t *zone); - Working from the root zone locate the primary master for the zone. - Used if masters are not given in named.conf. + Working from the root zone locate the primary server for the zone. + Used if primaries are not given in named.conf. dns_zone_locateservers(dns_zone_t *zone); Working from the root zone locate the servers for the zone. - Primary master moved to first in list if in NS set. Remove self + Primary server moved to first in list if in NS set. Remove self from list. - Used if masters are not given in named.conf. + Used if primaries are not given in named.conf. dns_zone_notify(dns_zone_t *); @@ -204,7 +204,7 @@ Functions: check that the parent nameservers NS lists for this zone agree with the NS list this zone, check glue A records. Warn if not identical. - This operation is performed on master zones. + This operation is performed on primary zones. dns_zone_checkchildren(dns_zone_t *); @@ -229,11 +229,11 @@ Functions: dns_zone_addmaster(dns_zone_t *zone, isc_sockaddr_t *addr); - Add addr to the set of masters for the zone. + Add addr to the set of primaries for the zone. dns_zone_clearmasters(dns_zone_t *zone); - Clear the master set. + Clear the primary set. dns_zone_setreadacl(dns_zone_t *, dns_acl_t *) diff --git a/doc/man/rndc.8in b/doc/man/rndc.8in index e4027c4a28..25543d5892 100644 --- a/doc/man/rndc.8in +++ b/doc/man/rndc.8in @@ -136,7 +136,7 @@ after a restart. This sample \fBaddzone\fP command adds the zone \fBexample.com\fP to the default view: .sp -\fBrndc addzone example.com \(aq{ type master; file "example.com.db"; };\(aq\fP +\fBrndc addzone example.com \(aq{ type primary; file "example.com.db"; };\(aq\fP .sp (Note the brackets around and semi\-colon after the zone configuration text.)