From: Evan Hunt <each@isc.org>
Date: Thu, 26 Aug 2021 05:29:25 +0000 (-0700)
Subject: rename dns_zone_master and dns_zone_slave
X-Git-Tag: v9.16.21~7^2~3
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=ddc677ae64b59491703b9d4b44cf6a0c85e6d324;p=thirdparty%2Fbind9.git

rename dns_zone_master and dns_zone_slave

dns_zone_master and dns_zone_slave are renamed as dns_zone_primary
and dns_zone_secondary.

(cherry picked from commit 916760ae46a608da0b7bba1c924be92425115da2)
---

diff --git a/bin/check/check-tool.c b/bin/check/check-tool.c
index fc80ac20125..d4a64aed632 100644
--- a/bin/check/check-tool.c
+++ b/bin/check/check-tool.c
@@ -687,7 +687,7 @@ load_zone(isc_mem_t *mctx, const char *zonename, const char *filename,
 
 	CHECK(dns_zone_create(&zone, mctx));
 
-	dns_zone_settype(zone, dns_zone_master);
+	dns_zone_settype(zone, dns_zone_primary);
 
 	isc_buffer_constinit(&buffer, zonename, strlen(zonename));
 	isc_buffer_add(&buffer, strlen(zonename));
diff --git a/bin/check/named-checkzone.c b/bin/check/named-checkzone.c
index d378944952e..e7aff4b1763 100644
--- a/bin/check/named-checkzone.c
+++ b/bin/check/named-checkzone.c
@@ -45,7 +45,7 @@
 static int quiet = 0;
 static isc_mem_t *mctx = NULL;
 dns_zone_t *zone = NULL;
-dns_zonetype_t zonetype = dns_zone_master;
+dns_zonetype_t zonetype = dns_zone_primary;
 static int dumpzone = 0;
 static const char *output_filename;
 static const char *prog_name = NULL;
diff --git a/bin/named/config.c b/bin/named/config.c
index 368fe7ff399..3a4d4de4842 100644
--- a/bin/named/config.c
+++ b/bin/named/config.c
@@ -450,10 +450,10 @@ named_config_getzonetype(const cfg_obj_t *zonetypeobj) {
 
 	str = cfg_obj_asstring(zonetypeobj);
 	if (strcasecmp(str, "primary") == 0 || strcasecmp(str, "master") == 0) {
-		ztype = dns_zone_master;
+		ztype = dns_zone_primary;
 	} else if (strcasecmp(str, "secondary") == 0 ||
 		   strcasecmp(str, "slave") == 0) {
-		ztype = dns_zone_slave;
+		ztype = dns_zone_secondary;
 	} else if (strcasecmp(str, "mirror") == 0) {
 		ztype = dns_zone_mirror;
 	} else if (strcasecmp(str, "stub") == 0) {
diff --git a/bin/named/server.c b/bin/named/server.c
index 2d42e75304c..0237817c297 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -1989,7 +1989,7 @@ dns64_reverse(dns_view_t *view, isc_mem_t *mctx, isc_netaddr_t *na,
 	dns_zone_setview(zone, view);
 	CHECK(dns_zonemgr_managezone(named_g_server->zonemgr, zone));
 	dns_zone_setclass(zone, view->rdclass);
-	dns_zone_settype(zone, dns_zone_master);
+	dns_zone_settype(zone, dns_zone_primary);
 	dns_zone_setstats(zone, named_g_server->zonestats);
 	dns_zone_setdbtype(zone, dns64_dbtypec, dns64_dbtype);
 	if (view->queryacl != NULL) {
@@ -3503,7 +3503,8 @@ create_empty_zone(dns_zone_t *zone, dns_name_t *name, dns_view_t *view,
 			zone = NULL;
 		}
 
-		if (zone != NULL && dns_zone_gettype(zone) != dns_zone_master) {
+		if (zone != NULL && dns_zone_gettype(zone) != dns_zone_primary)
+		{
 			zone = NULL;
 		}
 		if (zone != NULL && dns_zone_getfile(zone) != NULL) {
@@ -3527,7 +3528,7 @@ create_empty_zone(dns_zone_t *zone, dns_name_t *name, dns_view_t *view,
 			dns_zone_setdbtype(zone, empty_dbtypec, empty_dbtype);
 		}
 		dns_zone_setclass(zone, view->rdclass);
-		dns_zone_settype(zone, dns_zone_master);
+		dns_zone_settype(zone, dns_zone_primary);
 		dns_zone_setstats(zone, named_g_server->zonestats);
 	}
 
@@ -10673,10 +10674,10 @@ named_server_retransfercommand(named_server_t *server, isc_lex_t *lex,
 		dns_zone_detach(&raw);
 	}
 	type = dns_zone_gettype(zone);
-	if (type == dns_zone_slave || type == dns_zone_mirror ||
+	if (type == dns_zone_secondary || type == dns_zone_mirror ||
 	    type == dns_zone_stub ||
 	    (type == dns_zone_redirect &&
-	     dns_zone_getredirecttype(zone) == dns_zone_slave))
+	     dns_zone_getredirecttype(zone) == dns_zone_secondary))
 	{
 		dns_zone_forcereload(zone);
 	} else {
@@ -10719,8 +10720,9 @@ named_server_reloadcommand(named_server_t *server, isc_lex_t *lex,
 		}
 	} else {
 		type = dns_zone_gettype(zone);
-		if (type == dns_zone_slave || type == dns_zone_mirror ||
-		    type == dns_zone_stub) {
+		if (type == dns_zone_secondary || type == dns_zone_mirror ||
+		    type == dns_zone_stub)
+		{
 			dns_zone_refresh(zone);
 			dns_zone_detach(&zone);
 			msg = "zone refresh queued";
@@ -10836,8 +10838,9 @@ named_server_refreshcommand(named_server_t *server, isc_lex_t *lex,
 	}
 
 	type = dns_zone_gettype(zone);
-	if (type == dns_zone_slave || type == dns_zone_mirror ||
-	    type == dns_zone_stub) {
+	if (type == dns_zone_secondary || type == dns_zone_mirror ||
+	    type == dns_zone_stub)
+	{
 		dns_zone_refresh(zone);
 		dns_zone_detach(&zone);
 		(void)putstr(text, msg1);
@@ -12312,7 +12315,7 @@ named_server_rekey(named_server_t *server, isc_lex_t *lex,
 	}
 
 	type = dns_zone_gettype(zone);
-	if (type != dns_zone_master) {
+	if (type != dns_zone_primary) {
 		dns_zone_detach(&zone);
 		return (DNS_R_NOTMASTER);
 	}
@@ -12492,7 +12495,7 @@ named_server_freeze(named_server_t *server, bool freeze, isc_lex_t *lex,
 		dns_zone_detach(&raw);
 	}
 	type = dns_zone_gettype(mayberaw);
-	if (type != dns_zone_master) {
+	if (type != dns_zone_primary) {
 		dns_zone_detach(&mayberaw);
 		return (DNS_R_NOTMASTER);
 	}
@@ -14202,7 +14205,7 @@ named_server_delzone(named_server_t *server, isc_lex_t *lex,
 		TCHECK(putstr(text, "zone '"));
 		TCHECK(putstr(text, zonename));
 		TCHECK(putstr(text, "' and associated files will be deleted."));
-	} else if (dns_zone_gettype(mayberaw) == dns_zone_slave ||
+	} else if (dns_zone_gettype(mayberaw) == dns_zone_secondary ||
 		   dns_zone_gettype(mayberaw) == dns_zone_mirror ||
 		   dns_zone_gettype(mayberaw) == dns_zone_stub)
 	{
@@ -15119,7 +15122,7 @@ named_server_zonestatus(named_server_t *server, isc_lex_t *lex,
 	isc_time_formathttptimestamp(&loadtime, lbuf, sizeof(lbuf));
 
 	/* Refresh/expire times */
-	if (zonetype == dns_zone_slave || zonetype == dns_zone_mirror ||
+	if (zonetype == dns_zone_secondary || zonetype == dns_zone_mirror ||
 	    zonetype == dns_zone_stub || zonetype == dns_zone_redirect)
 	{
 		dns_zone_getexpiretime(mayberaw, &expiretime);
@@ -15129,23 +15132,23 @@ named_server_zonestatus(named_server_t *server, isc_lex_t *lex,
 	}
 
 	/* Key refresh time */
-	if (zonetype == dns_zone_master ||
-	    (zonetype == dns_zone_slave && hasraw)) {
+	if (zonetype == dns_zone_primary ||
+	    (zonetype == dns_zone_secondary && hasraw)) {
 		dns_zone_getrefreshkeytime(zone, &refreshkeytime);
 		isc_time_formathttptimestamp(&refreshkeytime, kbuf,
 					     sizeof(kbuf));
 	}
 
 	/* Dynamic? */
-	if (zonetype == dns_zone_master) {
+	if (zonetype == dns_zone_primary) {
 		dynamic = dns_zone_isdynamic(mayberaw, true);
 		frozen = dynamic && !dns_zone_isdynamic(mayberaw, false);
 	}
 
 	/* Next resign event */
 	if (secure &&
-	    (zonetype == dns_zone_master ||
-	     (zonetype == dns_zone_slave && hasraw)) &&
+	    (zonetype == dns_zone_primary ||
+	     (zonetype == dns_zone_secondary && hasraw)) &&
 	    ((dns_zone_getkeyopts(zone) & DNS_ZONEKEY_NORESIGN) == 0))
 	{
 		dns_name_t *name;
diff --git a/bin/named/statschannel.c b/bin/named/statschannel.c
index 34f459a119e..8ff256775d1 100644
--- a/bin/named/statschannel.c
+++ b/bin/named/statschannel.c
@@ -97,8 +97,8 @@ user_zonetype(dns_zone_t *zone) {
 		const dns_zonetype_t type;
 		const char *const string;
 	} typemap[] = { { dns_zone_none, "none" },
-			{ dns_zone_master, "master" },
-			{ dns_zone_slave, "slave" },
+			{ dns_zone_primary, "master" },
+			{ dns_zone_secondary, "slave" },
 			{ dns_zone_mirror, "mirror" },
 			{ dns_zone_stub, "stub" },
 			{ dns_zone_staticstub, "static-stub" },
@@ -1826,7 +1826,7 @@ zone_xmlrender(dns_zone_t *zone, void *arg) {
 	TRY0(xmlTextWriterWriteString(writer, ISC_XMLCHAR buf));
 	TRY0(xmlTextWriterEndElement(writer));
 
-	if (dns_zone_gettype(zone) == dns_zone_slave) {
+	if (dns_zone_gettype(zone) == dns_zone_secondary) {
 		result = dns_zone_getexpiretime(zone, &timestamp);
 		if (result != ISC_R_SUCCESS) {
 			goto error;
@@ -2672,7 +2672,7 @@ zone_jsonrender(dns_zone_t *zone, void *arg) {
 	isc_time_formatISO8601(&timestamp, buf, 64);
 	json_object_object_add(zoneobj, "loaded", json_object_new_string(buf));
 
-	if (dns_zone_gettype(zone) == dns_zone_slave) {
+	if (dns_zone_gettype(zone) == dns_zone_secondary) {
 		result = dns_zone_getexpiretime(zone, &timestamp);
 		if (result != ISC_R_SUCCESS) {
 			goto error;
diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
index 3c160e35859..87d5b9fcdc3 100644
--- a/bin/named/zoneconf.c
+++ b/bin/named/zoneconf.c
@@ -735,14 +735,14 @@ checknames(dns_zonetype_t ztype, const cfg_obj_t **maps,
 	isc_result_t result;
 
 	switch (ztype) {
-	case dns_zone_slave:
+	case dns_zone_secondary:
 	case dns_zone_mirror:
 		result = named_checknames_get(maps, "secondary", objp);
 		if (result != ISC_R_SUCCESS) {
 			result = named_checknames_get(maps, "slave", objp);
 		}
 		break;
-	case dns_zone_master:
+	case dns_zone_primary:
 		result = named_checknames_get(maps, "primary", objp);
 		if (result != ISC_R_SUCCESS) {
 			result = named_checknames_get(maps, "master", objp);
@@ -947,7 +947,7 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
 	ztype = zonetype_fromconfig(zoptions);
 	if (raw != NULL) {
 		dns_zone_settype(raw, ztype);
-		dns_zone_settype(zone, dns_zone_master);
+		dns_zone_settype(zone, dns_zone_primary);
 	} else {
 		dns_zone_settype(zone, ztype);
 	}
@@ -1008,7 +1008,7 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
 	 * Unless we're using some alternative database, a master zone
 	 * will be needing a master file.
 	 */
-	if (ztype == dns_zone_master && cpval == default_dbtype &&
+	if (ztype == dns_zone_primary && cpval == default_dbtype &&
 	    filename == NULL) {
 		isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
 			      NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR,
@@ -1016,7 +1016,7 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
 		return (ISC_R_FAILURE);
 	}
 
-	if (ztype == dns_zone_slave || ztype == dns_zone_mirror) {
+	if (ztype == dns_zone_secondary || ztype == dns_zone_mirror) {
 		masterformat = dns_masterformat_raw;
 	} else {
 		masterformat = dns_masterformat_text;
@@ -1121,7 +1121,7 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
 	/*
 	 * Notify messages are processed by the raw zone if it exists.
 	 */
-	if (ztype == dns_zone_slave || ztype == dns_zone_mirror) {
+	if (ztype == dns_zone_secondary || ztype == dns_zone_mirror) {
 		RETERR(configure_zone_acl(
 			zconfig, vconfig, config, allow_notify, ac, mayberaw,
 			dns_zone_setnotifyacl, dns_zone_clearnotifyacl));
@@ -1282,7 +1282,7 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
 		    (notifytype == dns_notifytype_yes ||
 		     notifytype == dns_notifytype_explicit ||
 		     (notifytype == dns_notifytype_masteronly &&
-		      ztype == dns_zone_master)))
+		      ztype == dns_zone_primary)))
 		{
 			dns_ipkeylist_t ipkl;
 			dns_ipkeylist_init(&ipkl);
@@ -1408,13 +1408,13 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
 			ixfrdiff = cfg_obj_asboolean(obj);
 		} else if ((strcasecmp(cfg_obj_asstring(obj), "primary") == 0 ||
 			    strcasecmp(cfg_obj_asstring(obj), "master") == 0) &&
-			   ztype == dns_zone_master)
+			   ztype == dns_zone_primary)
 		{
 			ixfrdiff = true;
 		} else if ((strcasecmp(cfg_obj_asstring(obj), "secondary") ==
 				    0 ||
 			    strcasecmp(cfg_obj_asstring(obj), "slave") == 0) &&
-			   ztype == dns_zone_slave)
+			   ztype == dns_zone_secondary)
 		{
 			ixfrdiff = true;
 		} else {
@@ -1545,7 +1545,7 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
 	 * Configure update-related options.  These apply to
 	 * primary servers only.
 	 */
-	if (ztype == dns_zone_master) {
+	if (ztype == dns_zone_primary) {
 		dns_acl_t *updateacl;
 
 		RETERR(configure_zone_acl(
@@ -1564,7 +1564,7 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
 		RETERR(configure_zone_ssutable(zoptions, mayberaw, zname));
 	}
 
-	if (ztype == dns_zone_master || raw != NULL) {
+	if (ztype == dns_zone_primary || raw != NULL) {
 		const cfg_obj_t *validity, *resign;
 		bool allow = false, maint = false;
 		bool sigvalinsecs;
@@ -1705,7 +1705,7 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
 		}
 	}
 
-	if (ztype == dns_zone_slave || ztype == dns_zone_mirror) {
+	if (ztype == dns_zone_secondary || ztype == dns_zone_mirror) {
 		RETERR(configure_zone_acl(zconfig, vconfig, config,
 					  allow_update_forwarding, ac, mayberaw,
 					  dns_zone_setforwardacl,
@@ -1715,7 +1715,7 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
 	/*%
 	 * Configure parental agents, applies to primary and secondary zones.
 	 */
-	if (ztype == dns_zone_master || ztype == dns_zone_slave) {
+	if (ztype == dns_zone_primary || ztype == dns_zone_secondary) {
 		obj = NULL;
 		(void)cfg_map_get(zoptions, "parental-agents", &obj);
 		if (obj != NULL) {
@@ -1735,7 +1735,7 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
 	/*%
 	 * Primary master functionality.
 	 */
-	if (ztype == dns_zone_master) {
+	if (ztype == dns_zone_primary) {
 		obj = NULL;
 		result = named_config_get(maps, "check-wildcard", &obj);
 		if (result == ISC_R_SUCCESS) {
@@ -1909,7 +1909,7 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
 			dns_acl_detach(&none);
 		}
 	/* FALLTHROUGH */
-	case dns_zone_slave:
+	case dns_zone_secondary:
 	case dns_zone_stub:
 	case dns_zone_redirect:
 		count = 0;
diff --git a/bin/tests/optional/zone_test.c b/bin/tests/optional/zone_test.c
index 0f3430ecdc9..31f95dd7c5e 100644
--- a/bin/tests/optional/zone_test.c
+++ b/bin/tests/optional/zone_test.c
@@ -44,7 +44,7 @@ isc_taskmgr_t *taskmgr = NULL;
 isc_timermgr_t *timermgr = NULL;
 isc_socketmgr_t *socketmgr = NULL;
 dns_zonemgr_t *zonemgr = NULL;
-dns_zonetype_t zonetype = dns_zone_master;
+dns_zonetype_t zonetype = dns_zone_primary;
 isc_sockaddr_t addr;
 
 #define ERRRET(result, function)                                        \
@@ -115,7 +115,7 @@ setup(const char *zonename, const char *filename, const char *classname) {
 
 	dns_zone_setclass(zone, rdclass);
 
-	if (zonetype == dns_zone_slave) {
+	if (zonetype == dns_zone_secondary) {
 		dns_zone_setprimaries(zone, &addr, 1);
 	}
 
@@ -271,10 +271,10 @@ main(int argc, char **argv) {
 			stats++;
 			break;
 		case 'S':
-			zonetype = dns_zone_slave;
+			zonetype = dns_zone_secondary;
 			break;
 		case 'M':
-			zonetype = dns_zone_master;
+			zonetype = dns_zone_primary;
 			break;
 		default:
 			usage();
diff --git a/bin/tests/system/dyndb/driver/zone.c b/bin/tests/system/dyndb/driver/zone.c
index da85ecb82e4..68857aa2c48 100644
--- a/bin/tests/system/dyndb/driver/zone.c
+++ b/bin/tests/system/dyndb/driver/zone.c
@@ -54,7 +54,7 @@ create_zone(sample_instance_t *const inst, dns_name_t *const name,
 		goto cleanup;
 	}
 	dns_zone_setclass(raw, dns_rdataclass_in);
-	dns_zone_settype(raw, dns_zone_master);
+	dns_zone_settype(raw, dns_zone_primary);
 	dns_zone_setdbtype(raw, 1, zone_argv);
 
 	result = dns_zonemgr_managezone(inst->zmgr, raw);
diff --git a/doc/design/zone b/doc/design/zone
index 00ca8f58dcd..4d12e6680fe 100644
--- a/doc/design/zone
+++ b/doc/design/zone
@@ -109,8 +109,8 @@ Types:
 
 	typedef enum {
 		dns_zone_none = 0,
-		dns_zone_master,
-		dns_zone_slave,
+		dns_zone_primary,
+		dns_zone_secondary,
 		dns_zone_mirror,
 		dns_zone_stub,
 		dns_zone_hint,
diff --git a/lib/dns/include/dns/zone.h b/lib/dns/include/dns/zone.h
index d756a5a3644..08e2263c5b2 100644
--- a/lib/dns/include/dns/zone.h
+++ b/lib/dns/include/dns/zone.h
@@ -36,8 +36,8 @@
 
 typedef enum {
 	dns_zone_none,
-	dns_zone_master,
-	dns_zone_slave,
+	dns_zone_primary,
+	dns_zone_secondary,
 	dns_zone_mirror,
 	dns_zone_stub,
 	dns_zone_staticstub,
@@ -46,6 +46,14 @@ typedef enum {
 	dns_zone_redirect
 } dns_zonetype_t;
 
+#ifndef dns_zone_master
+#define dns_zone_master dns_zone_primary
+#endif /* dns_zone_master */
+
+#ifndef dns_zone_slave
+#define dns_zone_slave dns_zone_secondary
+#endif /* dns_zone_slave */
+
 typedef enum {
 	dns_zonestat_none = 0,
 	dns_zonestat_terse,
@@ -1434,8 +1442,8 @@ dns_zone_getredirecttype(dns_zone_t *zone);
  *\li	'zone' to be a redirect zone.
  *
  * Returns:
- *\li	'dns_zone_master'
- *\li	'dns_zone_slave'
+ *\li	'dns_zone_primary'
+ *\li	'dns_zone_secondary'
  */
 
 void
diff --git a/lib/dns/tests/dnstest.c b/lib/dns/tests/dnstest.c
index aa379ba7a38..465ce9f9c59 100644
--- a/lib/dns/tests/dnstest.c
+++ b/lib/dns/tests/dnstest.c
@@ -252,7 +252,7 @@ dns_test_makezone(const char *name, dns_zone_t **zonep, dns_view_t *view,
 	/*
 	 * Set zone type and origin.
 	 */
-	dns_zone_settype(zone, dns_zone_master);
+	dns_zone_settype(zone, dns_zone_primary);
 	origin = dns_fixedname_initname(&fixed_origin);
 	result = dns_name_fromstring(origin, name, 0, NULL);
 	if (result != ISC_R_SUCCESS) {
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index d563f2a95da..5ec499d2c59 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -1836,7 +1836,7 @@ bool
 dns_zone_isdynamic(dns_zone_t *zone, bool ignore_freeze) {
 	REQUIRE(DNS_ZONE_VALID(zone));
 
-	if (zone->type == dns_zone_slave || zone->type == dns_zone_mirror ||
+	if (zone->type == dns_zone_secondary || zone->type == dns_zone_mirror ||
 	    zone->type == dns_zone_stub || zone->type == dns_zone_key ||
 	    (zone->type == dns_zone_redirect && zone->masters != NULL))
 	{
@@ -1844,12 +1844,12 @@ dns_zone_isdynamic(dns_zone_t *zone, bool ignore_freeze) {
 	}
 
 	/* Inline zones are always dynamic. */
-	if (zone->type == dns_zone_master && zone->raw != NULL) {
+	if (zone->type == dns_zone_primary && zone->raw != NULL) {
 		return (true);
 	}
 
 	/* If !ignore_freeze, we need check whether updates are disabled.  */
-	if (zone->type == dns_zone_master &&
+	if (zone->type == dns_zone_primary &&
 	    (!zone->update_disabled || ignore_freeze) &&
 	    ((zone->ssutable != NULL) ||
 	     (zone->update_acl != NULL && !dns_acl_isnone(zone->update_acl))))
@@ -2100,7 +2100,7 @@ zone_load(dns_zone_t *zone, unsigned int flags, bool locked) {
 		 * reloaded.  Do nothing - the database we already
 		 * have is guaranteed to be up-to-date.
 		 */
-		if (zone->type == dns_zone_master && !hasraw) {
+		if (zone->type == dns_zone_primary && !hasraw) {
 			result = DNS_R_DYNAMIC;
 		} else {
 			result = ISC_R_SUCCESS;
@@ -2160,7 +2160,7 @@ zone_load(dns_zone_t *zone, unsigned int flags, bool locked) {
 	 * Built in zones (with the exception of empty zones) don't need
 	 * to be reloaded.
 	 */
-	if (zone->type == dns_zone_master &&
+	if (zone->type == dns_zone_primary &&
 	    strcmp(zone->db_argv[0], "_builtin") == 0 &&
 	    (zone->db_argc < 2 || strcmp(zone->db_argv[1], "empty") != 0) &&
 	    DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED))
@@ -2230,8 +2230,8 @@ zone_load(dns_zone_t *zone, unsigned int flags, bool locked) {
 		goto cleanup;
 	}
 
-	if ((zone->type == dns_zone_slave || zone->type == dns_zone_mirror ||
-	     zone->type == dns_zone_stub ||
+	if ((zone->type == dns_zone_secondary ||
+	     zone->type == dns_zone_mirror || zone->type == dns_zone_stub ||
 	     (zone->type == dns_zone_redirect && zone->masters != NULL)) &&
 	    rbt)
 	{
@@ -2268,8 +2268,8 @@ zone_load(dns_zone_t *zone, unsigned int flags, bool locked) {
 	}
 	dns_db_settask(db, zone->task);
 
-	if (zone->type == dns_zone_master || zone->type == dns_zone_slave ||
-	    zone->type == dns_zone_mirror)
+	if (zone->type == dns_zone_primary ||
+	    zone->type == dns_zone_secondary || zone->type == dns_zone_mirror)
 	{
 		result = dns_db_setgluecachestats(db, zone->gluecachestats);
 		if (result == ISC_R_NOTIMPLEMENTED) {
@@ -2285,7 +2285,7 @@ zone_load(dns_zone_t *zone, unsigned int flags, bool locked) {
 			result = zone_startload(db, zone, loadtime);
 		} else {
 			result = DNS_R_NOMASTERFILE;
-			if (zone->type == dns_zone_master ||
+			if (zone->type == dns_zone_primary ||
 			    (zone->type == dns_zone_redirect &&
 			     zone->masters == NULL))
 			{
@@ -2414,7 +2414,7 @@ dns_zone_loadandthaw(dns_zone_t *zone) {
 		 * have been made. If we do DNSSEC maintenance on this
 		 * zone, schedule a full sign for this zone.
 		 */
-		if (zone->type == dns_zone_master &&
+		if (zone->type == dns_zone_primary &&
 		    DNS_ZONEKEY_OPTION(zone, DNS_ZONEKEY_MAINTAIN))
 		{
 			DNS_ZONEKEY_SETOPTION(zone, DNS_ZONEKEY_FULLSIGN);
@@ -2446,7 +2446,7 @@ get_master_options(dns_zone_t *zone) {
 	unsigned int options;
 
 	options = DNS_MASTER_ZONE | DNS_MASTER_RESIGN;
-	if (zone->type == dns_zone_slave || zone->type == dns_zone_mirror ||
+	if (zone->type == dns_zone_secondary || zone->type == dns_zone_mirror ||
 	    (zone->type == dns_zone_redirect && zone->masters == NULL))
 	{
 		options |= DNS_MASTER_SLAVE;
@@ -2771,7 +2771,7 @@ zone_check_mx(dns_zone_t *zone, dns_db_t *db, dns_name_t *name,
 		return (true);
 	}
 
-	if (zone->type == dns_zone_master) {
+	if (zone->type == dns_zone_primary) {
 		level = ISC_LOG_ERROR;
 	} else {
 		level = ISC_LOG_WARNING;
@@ -2872,7 +2872,7 @@ zone_check_srv(dns_zone_t *zone, dns_db_t *db, dns_name_t *name,
 		return (true);
 	}
 
-	if (zone->type == dns_zone_master) {
+	if (zone->type == dns_zone_primary) {
 		level = ISC_LOG_ERROR;
 	} else {
 		level = ISC_LOG_WARNING;
@@ -2967,7 +2967,7 @@ zone_check_glue(dns_zone_t *zone, dns_db_t *db, dns_name_t *name,
 		return (true);
 	}
 
-	if (zone->type == dns_zone_master) {
+	if (zone->type == dns_zone_primary) {
 		level = ISC_LOG_ERROR;
 	} else {
 		level = ISC_LOG_WARNING;
@@ -3902,7 +3902,7 @@ set_resigntime(dns_zone_t *zone) {
 	}
 
 	if (!inline_secure(zone) &&
-	    (zone->type != dns_zone_master ||
+	    (zone->type != dns_zone_primary ||
 	     (zone->ssutable == NULL &&
 	      (zone->update_acl == NULL || dns_acl_isnone(zone->update_acl)))))
 	{
@@ -3947,7 +3947,7 @@ check_nsec3param(dns_zone_t *zone, dns_db_t *db) {
 	dns_rdata_nsec3param_t nsec3param;
 	dns_rdataset_t rdataset;
 	isc_result_t result;
-	bool dynamic = (zone->type == dns_zone_master)
+	bool dynamic = (zone->type == dns_zone_primary)
 			       ? dns_zone_isdynamic(zone, false)
 			       : false;
 
@@ -4783,7 +4783,7 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime,
 	 * XXX better error feedback to log.
 	 */
 	if (result != ISC_R_SUCCESS && result != DNS_R_SEENINCLUDE) {
-		if (zone->type == dns_zone_slave ||
+		if (zone->type == dns_zone_secondary ||
 		    zone->type == dns_zone_mirror ||
 		    zone->type == dns_zone_stub ||
 		    (zone->type == dns_zone_redirect && zone->masters == NULL))
@@ -4800,7 +4800,7 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime,
 					      zone->masterfile,
 					      dns_result_totext(result));
 			}
-		} else if (zone->type == dns_zone_master &&
+		} else if (zone->type == dns_zone_primary &&
 			   inline_secure(zone) && result == ISC_R_FILENOTFOUND)
 		{
 			dns_zone_logc(zone, DNS_LOGCATEGORY_ZONELOAD,
@@ -4947,8 +4947,8 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime,
 
 	switch (zone->type) {
 	case dns_zone_dlz:
-	case dns_zone_master:
-	case dns_zone_slave:
+	case dns_zone_primary:
+	case dns_zone_secondary:
 	case dns_zone_mirror:
 	case dns_zone_stub:
 	case dns_zone_redirect:
@@ -4966,7 +4966,7 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime,
 		if (result != ISC_R_SUCCESS) {
 			goto cleanup;
 		}
-		if (zone->type == dns_zone_master && errors != 0) {
+		if (zone->type == dns_zone_primary && errors != 0) {
 			result = DNS_R_BADZONE;
 			goto cleanup;
 		}
@@ -4977,14 +4977,14 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime,
 				goto cleanup;
 			}
 		}
-		if (zone->type == dns_zone_master &&
+		if (zone->type == dns_zone_primary &&
 		    DNS_ZONE_OPTION(zone, DNS_ZONEOPT_CHECKINTEGRITY) &&
 		    !integrity_checks(zone, db))
 		{
 			result = DNS_R_BADZONE;
 			goto cleanup;
 		}
-		if (zone->type == dns_zone_master &&
+		if (zone->type == dns_zone_primary &&
 		    DNS_ZONE_OPTION(zone, DNS_ZONEOPT_CHECKDUPRR) &&
 		    !zone_check_dup(zone, db))
 		{
@@ -4992,7 +4992,7 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime,
 			goto cleanup;
 		}
 
-		if (zone->type == dns_zone_master) {
+		if (zone->type == dns_zone_primary) {
 			result = dns_zone_cdscheck(zone, db, NULL);
 			if (result != ISC_R_SUCCESS) {
 				dns_zone_log(zone, ISC_LOG_ERROR,
@@ -5024,7 +5024,7 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime,
 			{
 				uint32_t serialmin, serialmax;
 
-				INSIST(zone->type == dns_zone_master);
+				INSIST(zone->type == dns_zone_primary);
 				INSIST(zone->raw == NULL);
 
 				if (serial == oldserial &&
@@ -5067,7 +5067,7 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime,
 			}
 		}
 
-		if (zone->type == dns_zone_master &&
+		if (zone->type == dns_zone_primary &&
 		    (zone->update_acl != NULL || zone->ssutable != NULL) &&
 		    dns_zone_getsigresigninginterval(zone) < (3 * refresh) &&
 		    dns_db_issecure(db))
@@ -5087,7 +5087,7 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime,
 		zone->minimum = minimum;
 		DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_HAVETIMERS);
 
-		if (zone->type == dns_zone_slave ||
+		if (zone->type == dns_zone_secondary ||
 		    zone->type == dns_zone_mirror ||
 		    zone->type == dns_zone_stub ||
 		    (zone->type == dns_zone_redirect && zone->masters != NULL))
@@ -5136,14 +5136,14 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime,
 	/*
 	 * Check for weak DNSKEY's.
 	 */
-	if (zone->type == dns_zone_master) {
+	if (zone->type == dns_zone_primary) {
 		zone_check_dnskeys(zone, db);
 	}
 
 	/*
 	 * Schedule DNSSEC key refresh.
 	 */
-	if (zone->type == dns_zone_master &&
+	if (zone->type == dns_zone_primary &&
 	    DNS_ZONEKEY_OPTION(zone, DNS_ZONEKEY_MAINTAIN))
 	{
 		zone->refreshkeytime = now;
@@ -5176,7 +5176,7 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime,
 	 * Finished loading inline-signing zone; need to get status
 	 * from the raw side now.
 	 */
-	if (zone->type == dns_zone_master && inline_secure(zone)) {
+	if (zone->type == dns_zone_primary && inline_secure(zone)) {
 		maybe_send_secure(zone);
 	}
 
@@ -5195,14 +5195,14 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime,
 	}
 
 	if (zone->task != NULL) {
-		if (zone->type == dns_zone_master) {
+		if (zone->type == dns_zone_primary) {
 			set_resigntime(zone);
 			resume_signingwithkey(zone);
 			resume_addnsec3chain(zone);
 		}
 
 		is_dynamic = dns_zone_isdynamic(zone, false);
-		if (zone->type == dns_zone_master &&
+		if (zone->type == dns_zone_primary &&
 		    !DNS_ZONEKEY_OPTION(zone, DNS_ZONEKEY_NORESIGN) &&
 		    is_dynamic && dns_db_issecure(db))
 		{
@@ -5294,7 +5294,7 @@ cleanup:
 		isc_mem_free(zone->mctx, inc->name);
 		isc_mem_put(zone->mctx, inc, sizeof(*inc));
 	}
-	if (zone->type == dns_zone_slave || zone->type == dns_zone_mirror ||
+	if (zone->type == dns_zone_secondary || zone->type == dns_zone_mirror ||
 	    zone->type == dns_zone_stub || zone->type == dns_zone_key ||
 	    (zone->type == dns_zone_redirect && zone->masters != NULL))
 	{
@@ -5315,13 +5315,13 @@ cleanup:
 			zone_settimer(zone, &now);
 		}
 		result = ISC_R_SUCCESS;
-	} else if (zone->type == dns_zone_master ||
+	} else if (zone->type == dns_zone_primary ||
 		   zone->type == dns_zone_redirect) {
 		if (!(inline_secure(zone) && result == ISC_R_FILENOTFOUND)) {
 			dns_zone_logc(zone, DNS_LOGCATEGORY_ZONELOAD,
 				      ISC_LOG_ERROR,
 				      "not loaded due to errors.");
-		} else if (zone->type == dns_zone_master) {
+		} else if (zone->type == dns_zone_primary) {
 			result = ISC_R_SUCCESS;
 		}
 	}
@@ -5385,7 +5385,7 @@ zone_check_ns(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *version,
 		return (true);
 	}
 
-	if (zone->type == dns_zone_master) {
+	if (zone->type == dns_zone_primary) {
 		level = ISC_LOG_ERROR;
 	} else {
 		level = ISC_LOG_WARNING;
@@ -5472,8 +5472,8 @@ zone_count_ns_rr(dns_zone_t *zone, dns_db_t *db, dns_dbnode_t *node,
 	result = dns_rdataset_first(&rdataset);
 	while (result == ISC_R_SUCCESS) {
 		if (errors != NULL && zone->rdclass == dns_rdataclass_in &&
-		    (zone->type == dns_zone_master ||
-		     zone->type == dns_zone_slave ||
+		    (zone->type == dns_zone_primary ||
+		     zone->type == dns_zone_secondary ||
 		     zone->type == dns_zone_mirror))
 		{
 			dns_rdata_init(&rdata);
@@ -11208,7 +11208,7 @@ zone_maintenance(dns_zone_t *zone) {
 			break;
 		}
 	/* FALLTHROUGH */
-	case dns_zone_slave:
+	case dns_zone_secondary:
 	case dns_zone_mirror:
 	case dns_zone_stub:
 		LOCK_ZONE(zone);
@@ -11233,7 +11233,7 @@ zone_maintenance(dns_zone_t *zone) {
 			break;
 		}
 	/* FALLTHROUGH */
-	case dns_zone_slave:
+	case dns_zone_secondary:
 	case dns_zone_mirror:
 	case dns_zone_stub:
 		if (!DNS_ZONE_FLAG(zone, DNS_ZONEFLG_DIALREFRESH) &&
@@ -11251,7 +11251,7 @@ zone_maintenance(dns_zone_t *zone) {
 	 * primaries after.
 	 */
 	LOCK_ZONE(zone);
-	need_notify = (zone->type == dns_zone_slave ||
+	need_notify = (zone->type == dns_zone_secondary ||
 		       zone->type == dns_zone_mirror) &&
 		      (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NEEDNOTIFY) ||
 		       DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NEEDSTARTUPNOTIFY)) &&
@@ -11266,8 +11266,8 @@ zone_maintenance(dns_zone_t *zone) {
 	 * Do we need to consolidate the backing store?
 	 */
 	switch (zone->type) {
-	case dns_zone_master:
-	case dns_zone_slave:
+	case dns_zone_primary:
+	case dns_zone_secondary:
 	case dns_zone_mirror:
 	case dns_zone_key:
 	case dns_zone_redirect:
@@ -11300,7 +11300,7 @@ zone_maintenance(dns_zone_t *zone) {
 	 * Master/redirect zones send notifies now, if needed
 	 */
 	switch (zone->type) {
-	case dns_zone_master:
+	case dns_zone_primary:
 	case dns_zone_redirect:
 		if ((DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NEEDNOTIFY) ||
 		     DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NEEDSTARTUPNOTIFY)) &&
@@ -11325,7 +11325,7 @@ zone_maintenance(dns_zone_t *zone) {
 			}
 		}
 		break;
-	case dns_zone_master:
+	case dns_zone_primary:
 		if (!isc_time_isepoch(&zone->refreshkeytime) &&
 		    isc_time_compare(&now, &zone->refreshkeytime) >= 0 &&
 		    zone->rss_event == NULL)
@@ -11337,9 +11337,9 @@ zone_maintenance(dns_zone_t *zone) {
 	}
 
 	switch (zone->type) {
-	case dns_zone_master:
+	case dns_zone_primary:
 	case dns_zone_redirect:
-	case dns_zone_slave:
+	case dns_zone_secondary:
 		/*
 		 * Do we need to sign/resign some RRsets?
 		 */
@@ -11391,7 +11391,7 @@ dns_zone_markdirty(dns_zone_t *zone) {
 	 */
 again:
 	LOCK_ZONE(zone);
-	if (zone->type == dns_zone_master) {
+	if (zone->type == dns_zone_primary) {
 		if (inline_raw(zone)) {
 			unsigned int soacount;
 			secure = zone->secure;
@@ -11564,7 +11564,7 @@ zone_journal_rollforward(dns_zone_t *zone, dns_db_t *db, bool *needdump,
 	unsigned int options;
 	isc_result_t result;
 
-	if (zone->type == dns_zone_master &&
+	if (zone->type == dns_zone_primary &&
 	    (inline_secure(zone) ||
 	     (zone->update_acl != NULL || zone->ssutable != NULL)))
 	{
@@ -12696,7 +12696,7 @@ zone_notify(dns_zone_t *zone, isc_time_t *now) {
 	}
 
 	if (notifytype == dns_notifytype_masteronly &&
-	    zone->type != dns_zone_master) {
+	    zone->type != dns_zone_primary) {
 		return;
 	}
 
@@ -13870,7 +13870,7 @@ refresh_callback(isc_task_t *task, isc_event_t *event) {
 				     "master %s exceeded (source %s)",
 				     master, source);
 			/* Try with slave with TCP. */
-			if ((zone->type == dns_zone_slave ||
+			if ((zone->type == dns_zone_secondary ||
 			     zone->type == dns_zone_mirror ||
 			     zone->type == dns_zone_redirect) &&
 			    DNS_ZONE_OPTION(zone, DNS_ZONEOPT_TRYTCPREFRESH))
@@ -13966,7 +13966,7 @@ refresh_callback(isc_task_t *task, isc_event_t *event) {
 		 * Perhaps AXFR/IXFR is allowed even if SOA queries aren't.
 		 */
 		if (msg->rcode == dns_rcode_refused &&
-		    (zone->type == dns_zone_slave ||
+		    (zone->type == dns_zone_secondary ||
 		     zone->type == dns_zone_mirror ||
 		     zone->type == dns_zone_redirect))
 		{
@@ -13979,7 +13979,7 @@ refresh_callback(isc_task_t *task, isc_event_t *event) {
 	 * If truncated punt to zone transfer which will query again.
 	 */
 	if ((msg->flags & DNS_MESSAGEFLAG_TC) != 0) {
-		if (zone->type == dns_zone_slave ||
+		if (zone->type == dns_zone_secondary ||
 		    zone->type == dns_zone_mirror ||
 		    zone->type == dns_zone_redirect)
 		{
@@ -14115,7 +14115,7 @@ refresh_callback(isc_task_t *task, isc_event_t *event) {
 			dns_zone_log(zone, ISC_LOG_INFO,
 				     "refresh: skipping %s as master %s "
 				     "(source %s) is unreachable (cached)",
-				     (zone->type == dns_zone_slave ||
+				     (zone->type == dns_zone_secondary ||
 				      zone->type == dns_zone_mirror ||
 				      zone->type == dns_zone_redirect)
 					     ? "zone transfer"
@@ -14126,7 +14126,7 @@ refresh_callback(isc_task_t *task, isc_event_t *event) {
 	tcp_transfer:
 		isc_event_free(&event);
 		dns_request_destroy(&zone->request);
-		if (zone->type == dns_zone_slave ||
+		if (zone->type == dns_zone_secondary ||
 		    zone->type == dns_zone_mirror ||
 		    zone->type == dns_zone_redirect)
 		{
@@ -14930,7 +14930,7 @@ zone_settimer(dns_zone_t *zone, isc_time_t *now) {
 		}
 		/* FALLTHROUGH */
 
-	case dns_zone_master:
+	case dns_zone_primary:
 		if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NEEDNOTIFY) ||
 		    DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NEEDSTARTUPNOTIFY))
 		{
@@ -14984,7 +14984,7 @@ zone_settimer(dns_zone_t *zone, isc_time_t *now) {
 		}
 		break;
 
-	case dns_zone_slave:
+	case dns_zone_secondary:
 	case dns_zone_mirror:
 	treat_as_slave:
 		if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NEEDNOTIFY) ||
@@ -15331,7 +15331,7 @@ dns_zone_notifyreceive(dns_zone_t *zone, isc_sockaddr_t *from,
 	/*
 	 * If we are a master zone just succeed.
 	 */
-	if (zone->type == dns_zone_master) {
+	if (zone->type == dns_zone_primary) {
 		UNLOCK_ZONE(zone);
 		return (ISC_R_SUCCESS);
 	}
@@ -15961,9 +15961,9 @@ dns_zonetype_name(dns_zonetype_t type) {
 	switch (type) {
 	case dns_zone_none:
 		return ("none");
-	case dns_zone_master:
+	case dns_zone_primary:
 		return ("primary");
-	case dns_zone_slave:
+	case dns_zone_secondary:
 		return ("secondary");
 	case dns_zone_mirror:
 		return ("mirror");
@@ -15987,7 +15987,7 @@ dns_zone_getredirecttype(dns_zone_t *zone) {
 	REQUIRE(DNS_ZONE_VALID(zone));
 	REQUIRE(zone->type == dns_zone_redirect);
 
-	return (zone->masters == NULL ? dns_zone_master : dns_zone_slave);
+	return (zone->masters == NULL ? dns_zone_primary : dns_zone_secondary);
 }
 
 dns_name_t *
@@ -17197,7 +17197,7 @@ zone_replacedb(dns_zone_t *zone, dns_db_t *db, bool dump) {
 					  NULL);
 		RUNTIME_CHECK(result == ISC_R_SUCCESS);
 		RUNTIME_CHECK(soacount > 0U);
-		if ((zone->type == dns_zone_slave ||
+		if ((zone->type == dns_zone_secondary ||
 		     (zone->type == dns_zone_redirect &&
 		      zone->masters != NULL)) &&
 		    !isc_serial_gt(serial, oldserial))
@@ -17229,7 +17229,7 @@ zone_replacedb(dns_zone_t *zone, dns_db_t *db, bool dump) {
 		} else {
 			zone_journal_compact(zone, zone->db, serial);
 		}
-		if (zone->type == dns_zone_master && inline_raw(zone)) {
+		if (zone->type == dns_zone_primary && inline_raw(zone)) {
 			zone_send_secureserial(zone, serial);
 		}
 	} else {
@@ -19540,7 +19540,7 @@ void
 dns_zone_forcereload(dns_zone_t *zone) {
 	REQUIRE(DNS_ZONE_VALID(zone));
 
-	if (zone->type == dns_zone_master ||
+	if (zone->type == dns_zone_primary ||
 	    (zone->type == dns_zone_redirect && zone->masters == NULL))
 	{
 		return;
@@ -19678,7 +19678,7 @@ dns_zone_dialup(dns_zone_t *zone) {
 	if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_DIALNOTIFY)) {
 		dns_zone_notify(zone);
 	}
-	if (zone->type != dns_zone_master && zone->masters != NULL &&
+	if (zone->type != dns_zone_primary && zone->masters != NULL &&
 	    DNS_ZONE_FLAG(zone, DNS_ZONEFLG_DIALREFRESH))
 	{
 		dns_zone_refresh(zone);
@@ -21838,7 +21838,7 @@ void
 dns_zone_rekey(dns_zone_t *zone, bool fullsign) {
 	isc_time_t now;
 
-	if (zone->type == dns_zone_master && zone->task != NULL) {
+	if (zone->type == dns_zone_primary && zone->task != NULL) {
 		LOCK_ZONE(zone);
 
 		if (fullsign) {
diff --git a/lib/dns/zt.c b/lib/dns/zt.c
index 3fde5f16e18..8ca9cd65aa2 100644
--- a/lib/dns/zt.c
+++ b/lib/dns/zt.c
@@ -418,7 +418,7 @@ freezezones(dns_zone_t *zone, void *uap) {
 		}
 		return (ISC_R_SUCCESS);
 	}
-	if (dns_zone_gettype(zone) != dns_zone_master) {
+	if (dns_zone_gettype(zone) != dns_zone_primary) {
 		if (raw != NULL) {
 			dns_zone_detach(&raw);
 		}
diff --git a/lib/ns/notify.c b/lib/ns/notify.c
index f7f7d00e73b..4360588a088 100644
--- a/lib/ns/notify.c
+++ b/lib/ns/notify.c
@@ -148,8 +148,8 @@ ns_notify_start(ns_client_t *client, isc_nmhandle_t *handle) {
 	if (result == ISC_R_SUCCESS) {
 		dns_zonetype_t zonetype = dns_zone_gettype(zone);
 
-		if ((zonetype == dns_zone_master) ||
-		    (zonetype == dns_zone_slave) ||
+		if ((zonetype == dns_zone_primary) ||
+		    (zonetype == dns_zone_secondary) ||
 		    (zonetype == dns_zone_mirror) ||
 		    (zonetype == dns_zone_stub))
 		{
diff --git a/lib/ns/query.c b/lib/ns/query.c
index 5a96523bdb8..249321c652f 100644
--- a/lib/ns/query.c
+++ b/lib/ns/query.c
@@ -7690,7 +7690,7 @@ query_getexpire(query_ctx_t *qctx) {
 	dns_zone_getraw(qctx->zone, &raw);
 	mayberaw = (raw != NULL) ? raw : qctx->zone;
 
-	if (dns_zone_gettype(mayberaw) == dns_zone_slave ||
+	if (dns_zone_gettype(mayberaw) == dns_zone_secondary ||
 	    dns_zone_gettype(mayberaw) == dns_zone_mirror)
 	{
 		isc_time_t expiretime;
@@ -7702,7 +7702,7 @@ query_getexpire(query_ctx_t *qctx) {
 			qctx->client->attributes |= NS_CLIENTATTR_HAVEEXPIRE;
 			qctx->client->expire = secs - qctx->client->now;
 		}
-	} else if (dns_zone_gettype(mayberaw) == dns_zone_master) {
+	} else if (dns_zone_gettype(mayberaw) == dns_zone_primary) {
 		isc_result_t result;
 		dns_rdata_t rdata = DNS_RDATA_INIT;
 		dns_rdata_soa_t soa;
diff --git a/lib/ns/tests/nstest.c b/lib/ns/tests/nstest.c
index 69f47ad2d3f..4136d5397c6 100644
--- a/lib/ns/tests/nstest.c
+++ b/lib/ns/tests/nstest.c
@@ -438,7 +438,7 @@ ns_test_makezone(const char *name, dns_zone_t **zonep, dns_view_t *view,
 	CHECK(dns_name_fromtext(origin, &buffer, dns_rootname, 0, NULL));
 	CHECK(dns_zone_setorigin(zone, origin));
 	dns_zone_setview(zone, view);
-	dns_zone_settype(zone, dns_zone_master);
+	dns_zone_settype(zone, dns_zone_primary);
 	dns_zone_setclass(zone, view->rdclass);
 	dns_view_addzone(view, zone);
 
diff --git a/lib/ns/update.c b/lib/ns/update.c
index 8add90ab8e8..546b70a67da 100644
--- a/lib/ns/update.c
+++ b/lib/ns/update.c
@@ -1644,7 +1644,7 @@ ns_update_start(ns_client_t *client, isc_nmhandle_t *handle,
 	}
 
 	switch (dns_zone_gettype(zone)) {
-	case dns_zone_master:
+	case dns_zone_primary:
 	case dns_zone_dlz:
 		/*
 		 * We can now fail due to a bad signature as we now know
@@ -1656,7 +1656,7 @@ ns_update_start(ns_client_t *client, isc_nmhandle_t *handle,
 		dns_message_clonebuffer(client->message);
 		CHECK(send_update_event(client, zone));
 		break;
-	case dns_zone_slave:
+	case dns_zone_secondary:
 	case dns_zone_mirror:
 		CHECK(checkupdateacl(client, dns_zone_getforwardacl(zone),
 				     "update forwarding", zonename, true,
@@ -1672,7 +1672,7 @@ ns_update_start(ns_client_t *client, isc_nmhandle_t *handle,
 
 failure:
 	if (result == DNS_R_REFUSED) {
-		INSIST(dns_zone_gettype(zone) == dns_zone_slave ||
+		INSIST(dns_zone_gettype(zone) == dns_zone_secondary ||
 		       dns_zone_gettype(zone) == dns_zone_mirror);
 		inc_stats(client, zone, ns_statscounter_updaterej);
 	}
diff --git a/lib/ns/xfrout.c b/lib/ns/xfrout.c
index a5634a8c323..d4259e4b6dc 100644
--- a/lib/ns/xfrout.c
+++ b/lib/ns/xfrout.c
@@ -841,8 +841,8 @@ ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) {
 		/*
 		 * Master, slave, and mirror zones are OK for transfer.
 		 */
-		case dns_zone_master:
-		case dns_zone_slave:
+		case dns_zone_primary:
+		case dns_zone_secondary:
 		case dns_zone_mirror:
 		case dns_zone_dlz:
 			break;
@@ -1144,7 +1144,7 @@ have_stream:
 		dns_zone_getraw(zone, &raw);
 		mayberaw = (raw != NULL) ? raw : zone;
 		if ((client->attributes & NS_CLIENTATTR_WANTEXPIRE) != 0 &&
-		    (dns_zone_gettype(mayberaw) == dns_zone_slave ||
+		    (dns_zone_gettype(mayberaw) == dns_zone_secondary ||
 		     dns_zone_gettype(mayberaw) == dns_zone_mirror))
 		{
 			isc_time_t expiretime;