upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace "master/slave" terms in code

Browse source 
Replace some "master/slave" terminology in the code with the preferred
"primary/secondary" keywords. This also changes user output such as
log messages, and fixes a typo ("seconary") in cfg_test.c.

There are still some references to "master" and "slave" for various
reasons:

- The old syntax can still be used as a synonym.
- The master syntax is kept when it refers to master files and formats.
- This commit replaces mainly keywords that are local. If "master" or
  "slave" is used in for example a structure that is all over the
  place, it is considered out of scope for the moment.
This commit is contained in:
Matthijs Mekking 2021-10-05 11:28:24 +02:00 committed by Evan Hunt
parent af17ca9704
commit 2af05beafa
15 changed files with 479 additions and 464 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
bin/dnssec/dnssec-signzone.c
View file

@ -154,7 +154,7 @@ static dns_iterations_t nsec3iter = 10U;
static unsigned char saltbuf[255];
static unsigned char *gsalt = saltbuf;
static size_t salt_length = 0;
static isc_task_t *master = NULL;
static isc_task_t *main_task = NULL;
static unsigned int ntasks = 0;
static atomic_bool shuttingdown;
static atomic_bool finished;
@ -1580,7 +1580,7 @@ signapex(void) {
}
/*%
* Assigns a node to a worker thread. This is protected by the primary task's
* Assigns a node to a worker thread. This is protected by the main task's
* lock.
*/
static void
@ -1744,7 +1744,7 @@ sign(isc_task_t *task, isc_event_t *event) {
sizeof(sevent_t));
wevent->node = node;
wevent->fname = fname;
isc_task_send(master, ISC_EVENT_PTR(&wevent));
isc_task_send(main_task, ISC_EVENT_PTR(&wevent));
}
/*%
@ -3992,8 +3992,8 @@ main(int argc, char *argv[]) {
isc_managers_create(mctx, ntasks, 0, 0, &netmgr, &taskmgr, NULL, NULL);
master = NULL;
result = isc_task_create(taskmgr, 0, &master);
main_task = NULL;
result = isc_task_create(taskmgr, 0, &main_task);
if (result != ISC_R_SUCCESS) {
fatal("failed to create task: %s", isc_result_totext(result));
}
@ -4023,7 +4023,7 @@ main(int argc, char *argv[]) {
* processors if possible.
*/
for (i = 0; i < (int)ntasks; i++) {
result = isc_app_onrun(mctx, master, startworker,
result = isc_app_onrun(mctx, main_task, startworker,
tasks[i]);
if (result != ISC_R_SUCCESS) {
fatal("failed to start task: %s",
@ -4035,7 +4035,7 @@ main(int argc, char *argv[]) {
fatal("process aborted by user");
}
} else {
isc_task_detach(&master);
isc_task_detach(&main_task);
}
atomic_store(&shuttingdown, true);
for (i = 0; i < (int)ntasks; i++) {

10
bin/named/server.c
View file

@ -4153,8 +4153,8 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config,
NAMED_LOGCATEGORY_GENERAL,
NAMED_LOGMODULE_SERVER,
DNS_RPZ_ERROR_LEVEL,
"rpz '%s'"
" is not a master or slave zone",
"rpz '%s' is not a primary or a "
"secondary zone",
namebuf);
result = ISC_R_NOTFOUND;
goto cleanup;
@ -10829,7 +10829,7 @@ named_server_refreshcommand(named_server_t *server, isc_lex_t *lex,
isc_result_t result;
dns_zone_t *zone = NULL, *raw = NULL;
const char msg1[] = "zone refresh queued";
const char msg2[] = "not a slave, mirror, or stub zone";
const char msg2[] = "not a secondary, mirror, or stub zone";
dns_zonetype_t type;
REQUIRE(text != NULL);
@ -12627,7 +12627,7 @@ named_server_rekey(named_server_t *server, isc_lex_t *lex,
type = dns_zone_gettype(zone);
if (type != dns_zone_primary) {
dns_zone_detach(&zone);
return (DNS_R_NOTMASTER);
return (DNS_R_NOTPRIMARY);
}
keyopts = dns_zone_getkeyopts(zone);
@ -12807,7 +12807,7 @@ named_server_freeze(named_server_t *server, bool freeze, isc_lex_t *lex,
type = dns_zone_gettype(mayberaw);
if (type != dns_zone_primary) {
dns_zone_detach(&mayberaw);
return (DNS_R_NOTMASTER);
return (DNS_R_NOTPRIMARY);
}
if (freeze && !dns_zone_isdynamic(mayberaw, true)) {

142
bin/nsupdate/nsupdate.c
View file

@ -138,19 +138,19 @@ static dns_fixedname_t fzname;
static dns_name_t *userzone = NULL;
static dns_name_t *zname = NULL;
static dns_name_t tmpzonename = DNS_NAME_INITEMPTY;
static dns_name_t restart_master = DNS_NAME_INITEMPTY;
static dns_name_t restart_primary = DNS_NAME_INITEMPTY;
static dns_tsig_keyring_t *gssring = NULL;
static dns_tsigkey_t *tsigkey = NULL;
static dst_key_t *sig0key = NULL;
static isc_sockaddr_t *servers = NULL;
static isc_sockaddr_t *master_servers = NULL;
static isc_sockaddr_t *primary_servers = NULL;
static bool default_servers = true;
static int ns_inuse = 0;
static int master_inuse = 0;
static int primary_inuse = 0;
static int ns_total = 0;
static int ns_alloc = 0;
static int master_total = 0;
static int master_alloc = 0;
static int primary_total = 0;
static int primary_alloc = 0;
static isc_sockaddr_t *localaddr4 = NULL;
static isc_sockaddr_t *localaddr6 = NULL;
static const char *keyfile = NULL;
@ -183,7 +183,7 @@ static void
sendrequest(isc_sockaddr_t *destaddr, dns_message_t *msg,
dns_request_t **request);
static void
send_update(dns_name_t *zonename, isc_sockaddr_t *master);
send_update(dns_name_t *zonename, isc_sockaddr_t *primary);
ISC_NORETURN static void
fatal(const char *format, ...) ISC_FORMAT_PRINTF(1, 2);
@ -209,7 +209,7 @@ typedef struct nsu_gssinfo {
static void
failed_gssrequest(void);
static void
start_gssrequest(dns_name_t *master);
start_gssrequest(dns_name_t *primary);
static void
send_gssrequest(isc_sockaddr_t *destaddr, dns_message_t *msg,
dns_request_t **request, gss_ctx_id_t context);
@ -226,15 +226,15 @@ error(const char *format, ...) ISC_FORMAT_PRINTF(1, 2);
#define STATUS_SYNTAX (uint16_t)3
static void
master_from_servers(void) {
if (master_servers != NULL && master_servers != servers) {
isc_mem_put(gmctx, master_servers,
master_alloc * sizeof(isc_sockaddr_t));
primary_from_servers(void) {
if (primary_servers != NULL && primary_servers != servers) {
isc_mem_put(gmctx, primary_servers,
primary_alloc * sizeof(isc_sockaddr_t));
}
master_servers = servers;
master_total = ns_total;
master_alloc = ns_alloc;
master_inuse = ns_inuse;
primary_servers = servers;
primary_total = ns_total;
primary_alloc = ns_alloc;
primary_inuse = ns_inuse;
}
static dns_rdataclass_t
@ -686,9 +686,9 @@ doshutdown(void) {
* isc_mem_put of servers as it sets the servers pointer
* to NULL.
*/
if (master_servers != NULL && master_servers != servers) {
isc_mem_put(gmctx, master_servers,
master_alloc * sizeof(isc_sockaddr_t));
if (primary_servers != NULL && primary_servers != servers) {
isc_mem_put(gmctx, primary_servers,
primary_alloc * sizeof(isc_sockaddr_t));
}
if (servers != NULL) {
@ -823,8 +823,8 @@ setup_system(void) {
nslist = irs_resconf_getnameservers(resconf);
if (servers != NULL) {
if (master_servers == servers) {
master_servers = NULL;
if (primary_servers == servers) {
primary_servers = NULL;
}
isc_mem_put(gmctx, servers, ns_alloc * sizeof(isc_sockaddr_t));
}
@ -1502,8 +1502,8 @@ evaluate_server(char *cmdline) {
}
if (servers != NULL) {
if (master_servers == servers) {
master_servers = NULL;
if (primary_servers == servers) {
primary_servers = NULL;
}
isc_mem_put(gmctx, servers, ns_alloc * sizeof(isc_sockaddr_t));
}
@ -2212,7 +2212,7 @@ do_next_command(char *cmdline) {
fprintf(stdout, "nsupdate " PACKAGE_VERSION ":\n"
"local address [port] (set local "
"resolver)\n"
"server address [port] (set master server "
"server address [port] (set primary server "
"for zone)\n"
"send (send the update "
"request)\n"
@ -2344,13 +2344,13 @@ check_tsig_error(dns_rdataset_t *rdataset, isc_buffer_t *b) {
}
static bool
next_master(const char *caller, isc_sockaddr_t *addr, isc_result_t eresult) {
next_primary(const char *caller, isc_sockaddr_t *addr, isc_result_t eresult) {
char addrbuf[ISC_SOCKADDR_FORMATSIZE];
isc_sockaddr_format(addr, addrbuf, sizeof(addrbuf));
fprintf(stderr, "; Communication with %s failed: %s\n", addrbuf,
isc_result_totext(eresult));
if (++master_inuse >= master_total) {
if (++primary_inuse >= primary_total) {
return (false);
}
ddebug("%s: trying next server", caller);
@ -2381,8 +2381,9 @@ update_completed(isc_task_t *task, isc_event_t *event) {
}
if (reqev->result != ISC_R_SUCCESS) {
if (!next_master("update_completed",
&master_servers[master_inuse], reqev->result))
if (!next_primary("update_completed",
&primary_servers[primary_inuse],
reqev->result))
{
seenerror = true;
goto done;
@ -2392,7 +2393,7 @@ update_completed(isc_task_t *task, isc_event_t *event) {
dns_request_destroy(&request);
dns_message_renderreset(updatemsg);
dns_message_settsigkey(updatemsg, NULL);
send_update(zname, &master_servers[master_inuse]);
send_update(zname, &primary_servers[primary_inuse]);
isc_event_free(&event);
return;
}
@ -2460,16 +2461,16 @@ done:
dns_request_destroy(&request);
if (usegsstsig) {
dns_name_free(&tmpzonename, gmctx);
dns_name_free(&restart_master, gmctx);
dns_name_free(&restart_primary, gmctx);
dns_name_init(&tmpzonename, 0);
dns_name_init(&restart_master, 0);
dns_name_init(&restart_primary, 0);
}
isc_event_free(&event);
done_update();
}
static void
send_update(dns_name_t *zone, isc_sockaddr_t *master) {
send_update(dns_name_t *zone, isc_sockaddr_t *primary) {
isc_result_t result;
dns_request_t *request = NULL;
unsigned int options = DNS_REQUESTOPT_CASE;
@ -2489,11 +2490,11 @@ send_update(dns_name_t *zone, isc_sockaddr_t *master) {
if (debugging) {
char addrbuf[ISC_SOCKADDR_FORMATSIZE];
isc_sockaddr_format(master, addrbuf, sizeof(addrbuf));
isc_sockaddr_format(primary, addrbuf, sizeof(addrbuf));
fprintf(stderr, "Sending update to %s\n", addrbuf);
}
if (isc_sockaddr_pf(master) == AF_INET6) {
if (isc_sockaddr_pf(primary) == AF_INET6) {
srcaddr = localaddr6;
} else {
srcaddr = localaddr4;
@ -2504,7 +2505,7 @@ send_update(dns_name_t *zone, isc_sockaddr_t *master) {
updatemsg->tsigname->attributes |= DNS_NAMEATTR_NOCOMPRESS;
}
result = dns_request_createvia(requestmgr, updatemsg, srcaddr, master,
result = dns_request_createvia(requestmgr, updatemsg, srcaddr, primary,
-1, options, tsigkey, timeout,
udp_timeout, udp_retries, global_task,
update_completed, NULL, &request);
@ -2543,7 +2544,7 @@ recvsoa(isc_task_t *task, isc_event_t *event) {
dns_rdata_soa_t soa;
dns_rdata_t soarr = DNS_RDATA_INIT;
int pass = 0;
dns_name_t master;
dns_name_t primary;
nsu_requestinfo_t *reqinfo;
dns_message_t *soaquery = NULL;
isc_sockaddr_t *addr;
@ -2722,8 +2723,8 @@ lookforsoa:
result = dns_rdata_tostruct(&soarr, &soa, NULL);
check_result(result, "dns_rdata_tostruct");
dns_name_init(&master, NULL);
dns_name_clone(&soa.origin, &master);
dns_name_init(&primary, NULL);
dns_name_clone(&soa.origin, &primary);
if (userzone != NULL) {
zname = userzone;
@ -2738,8 +2739,8 @@ lookforsoa:
if (debugging) {
char namestr[DNS_NAME_FORMATSIZE];
dns_name_format(&master, namestr, sizeof(namestr));
fprintf(stderr, "The master is: %s\n", namestr);
dns_name_format(&primary, namestr, sizeof(namestr));
fprintf(stderr, "The primary is: %s\n", namestr);
}
if (default_servers) {
@ -2748,27 +2749,27 @@ lookforsoa:
size_t size;
isc_buffer_init(&buf, serverstr, sizeof(serverstr));
result = dns_name_totext(&master, true, &buf);
result = dns_name_totext(&primary, true, &buf);
check_result(result, "dns_name_totext");
serverstr[isc_buffer_usedlength(&buf)] = 0;
if (master_servers != NULL && master_servers != servers) {
isc_mem_put(gmctx, master_servers,
master_alloc * sizeof(isc_sockaddr_t));
if (primary_servers != NULL && primary_servers != servers) {
isc_mem_put(gmctx, primary_servers,
primary_alloc * sizeof(isc_sockaddr_t));
}
master_alloc = MAX_SERVERADDRS;
size = master_alloc * sizeof(isc_sockaddr_t);
master_servers = isc_mem_get(gmctx, size);
primary_alloc = MAX_SERVERADDRS;
size = primary_alloc * sizeof(isc_sockaddr_t);
primary_servers = isc_mem_get(gmctx, size);
memset(master_servers, 0, size);
master_total = get_addresses(serverstr, dnsport, master_servers,
master_alloc);
if (master_total == 0) {
memset(primary_servers, 0, size);
primary_total = get_addresses(serverstr, dnsport,
primary_servers, primary_alloc);
if (primary_total == 0) {
exit(1);
}
master_inuse = 0;
primary_inuse = 0;
} else {
master_from_servers();
primary_from_servers();
}
dns_rdata_freestruct(&soa);
@ -2776,15 +2777,15 @@ lookforsoa:
if (usegsstsig) {
dns_name_init(&tmpzonename, NULL);
dns_name_dup(zname, gmctx, &tmpzonename);
dns_name_init(&restart_master, NULL);
dns_name_dup(&master, gmctx, &restart_master);
start_gssrequest(&master);
dns_name_init(&restart_primary, NULL);
dns_name_dup(&primary, gmctx, &restart_primary);
start_gssrequest(&primary);
} else {
send_update(zname, &master_servers[master_inuse]);
send_update(zname, &primary_servers[primary_inuse]);
setzoneclass(dns_rdataclass_none);
}
#else /* HAVE_GSSAPI */
send_update(zname, &master_servers[master_inuse]);
send_update(zname, &primary_servers[primary_inuse]);
setzoneclass(dns_rdataclass_none);
#endif /* HAVE_GSSAPI */
@ -2899,15 +2900,15 @@ failed_gssrequest(void) {
seenerror = true;
dns_name_free(&tmpzonename, gmctx);
dns_name_free(&restart_master, gmctx);
dns_name_free(&restart_primary, gmctx);
dns_name_init(&tmpzonename, NULL);
dns_name_init(&restart_master, NULL);
dns_name_init(&restart_primary, NULL);
done_update();
}
static void
start_gssrequest(dns_name_t *master) {
start_gssrequest(dns_name_t *primary) {
dns_gss_ctx_id_t context;
isc_buffer_t buf;
isc_result_t result;
@ -2934,12 +2935,13 @@ start_gssrequest(dns_name_t *master) {
isc_result_totext(result));
}
dns_name_format(master, namestr, sizeof(namestr));
dns_name_format(primary, namestr, sizeof(namestr));
if (kserver == NULL) {
kserver = isc_mem_get(gmctx, sizeof(isc_sockaddr_t));
}
memmove(kserver, &master_servers[master_inuse], sizeof(isc_sockaddr_t));
memmove(kserver, &primary_servers[primary_inuse],
sizeof(isc_sockaddr_t));
servname = dns_fixedname_initname(&fname);
@ -3086,12 +3088,12 @@ recvgss(isc_task_t *task, isc_event_t *event) {
if (eresult != ISC_R_SUCCESS) {
ddebug("Destroying request [%p]", request);
dns_request_destroy(&request);
if (!next_master("recvgss", addr, eresult)) {
if (!next_primary("recvgss", addr, eresult)) {
dns_message_detach(&tsigquery);
failed_gssrequest();
} else {
dns_message_renderreset(tsigquery);
memmove(kserver, &master_servers[master_inuse],
memmove(kserver, &primary_servers[primary_inuse],
sizeof(isc_sockaddr_t));
send_gssrequest(kserver, tsigquery, &request, context);
}
@ -3129,7 +3131,7 @@ recvgss(isc_task_t *task, isc_event_t *event) {
use_win2k_gsstsig = true;
}
tried_other_gsstsig = true;
start_gssrequest(&restart_master);
start_gssrequest(&restart_primary);
goto done;
}
@ -3186,7 +3188,7 @@ recvgss(isc_task_t *task, isc_event_t *event) {
check_result(result, "dns_message_checksig");
#endif /* 0 */
send_update(&tmpzonename, &master_servers[master_inuse]);
send_update(&tmpzonename, &primary_servers[primary_inuse]);
setzoneclass(dns_rdataclass_none);
break;
@ -3228,8 +3230,8 @@ start_update(void) {
* the zone and / or the primary server.
*/
if (userzone != NULL && !default_servers && !usegsstsig) {
master_from_servers();
send_update(userzone, &master_servers[master_inuse]);
primary_from_servers();
send_update(userzone, &primary_servers[primary_inuse]);
setzoneclass(dns_rdataclass_none);
return;
}
@ -3338,8 +3340,8 @@ cleanup(void) {
if (dns_name_dynamic(&tmpzonename)) {
dns_name_free(&tmpzonename, gmctx);
}
if (dns_name_dynamic(&restart_master)) {
dns_name_free(&restart_master, gmctx);
if (dns_name_dynamic(&restart_primary)) {
dns_name_free(&restart_primary, gmctx);
}
#endif /* ifdef HAVE_GSSAPI */

2
doc/design/keydone
View file

@ -19,7 +19,7 @@ See COPYRIGHT in the source root or https://isc.org/copyright.html for terms.
zone must be a primary (signed inline == primary) or normal
dynamic zone.
Err: DNS_R_NOTMASTER
Err: DNS_R_NOTPRIMARY
dns_zone_<something>(zone, text) which will send a event
to the zone so that the deletion gets run in the zone's

2
doc/misc/cfg_test.c
View file

@ -111,7 +111,7 @@ main(int argc, char **argv) {
strcmp(argv[1], "primary") == 0) {
zonetype = CFG_ZONE_PRIMARY;
} else if (strcmp(argv[1], "slave") == 0 ||
strcmp(argv[1], "seconary") == 0) {
strcmp(argv[1], "secondary") == 0) {
zonetype = CFG_ZONE_SECONDARY;
} else if (strcmp(argv[1], "mirror") == 0) {
zonetype = CFG_ZONE_MIRROR;

12
lib/bind9/check.c
View file

@ -3409,7 +3409,8 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions,
!signing) {
cfg_obj_log(obj, logctx, ISC_LOG_ERROR,
"dnssec-dnskey-kskonly: requires "
"inline-signing when used in slave zone");
"inline-signing when used in secondary "
"zone");
result = ISC_R_FAILURE;
}
if (res1 == ISC_R_SUCCESS && has_dnssecpolicy) {
@ -3434,7 +3435,8 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions,
!signing) {
cfg_obj_log(obj, logctx, ISC_LOG_ERROR,
"dnssec-loadkeys-interval: requires "
"inline-signing when used in slave zone");
"inline-signing when used in secondary "
"zone");
result = ISC_R_FAILURE;
}
@ -3444,7 +3446,8 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions,
!signing) {
cfg_obj_log(obj, logctx, ISC_LOG_ERROR,
"update-check-ksk: requires "
"inline-signing when used in slave zone");
"inline-signing when used in secondary "
"zone");
result = ISC_R_FAILURE;
}
if (res1 == ISC_R_SUCCESS && has_dnssecpolicy) {
@ -4813,7 +4816,8 @@ check_rpz_catz(const char *rpz_catz, const cfg_obj_t *rpz_obj,
strcasecmp(zonetype, "slave") != 0)
{
cfg_obj_log(nameobj, logctx, ISC_LOG_ERROR,
"%s '%s'%s%s is not a master or slave zone",
"%s '%s'%s%s is not a primary or secondary "
"zone",
rpz_catz, zonename, forview, viewname);
if (result == ISC_R_SUCCESS) {
result = ISC_R_FAILURE;

16
lib/dns/catz.c
View file

@ -1069,8 +1069,8 @@ cleanup:
}
static isc_result_t
catz_process_masters(dns_catz_zone_t *zone, dns_ipkeylist_t *ipkl,
dns_rdataset_t *value, dns_name_t *name) {
catz_process_primaries(dns_catz_zone_t *zone, dns_ipkeylist_t *ipkl,
dns_rdataset_t *value, dns_name_t *name) {
isc_result_t result;
dns_rdata_t rdata;
dns_rdata_in_a_t rdata_a;
@ -1370,8 +1370,8 @@ catz_process_zones_suboption(dns_catz_zone_t *zone, dns_rdataset_t *value,
dns_name_split(name, 1, &prefix, NULL);
switch (opt) {
case CATZ_OPT_MASTERS:
return (catz_process_masters(zone, &entry->opts.masters, value,
&prefix));
return (catz_process_primaries(zone, &entry->opts.masters,
value, &prefix));
case CATZ_OPT_ALLOW_QUERY:
if (prefix.labels != 0) {
return (ISC_R_FAILURE);
@ -1430,8 +1430,8 @@ catz_process_value(dns_catz_zone_t *zone, dns_name_t *name,
case CATZ_OPT_ZONES:
return (catz_process_zones(zone, rdataset, &prefix));
case CATZ_OPT_MASTERS:
return (catz_process_masters(zone, &zone->zoneoptions.masters,
rdataset, &prefix));
return (catz_process_primaries(zone, &zone->zoneoptions.masters,
rdataset, &prefix));
case CATZ_OPT_ALLOW_QUERY:
if (prefix.labels != 0) {
return (ISC_R_FAILURE);
@ -1636,7 +1636,7 @@ dns_catz_generate_zonecfg(dns_catz_zone_t *zone, dns_catz_entry_t *entry,
isc_buffer_setautorealloc(buffer, true);
isc_buffer_putstr(buffer, "zone \"");
dns_name_totext(&entry->name, true, buffer);
isc_buffer_putstr(buffer, "\" { type slave; masters");
isc_buffer_putstr(buffer, "\" { type secondary; primaries");
/*
* DSCP value has no default, but when it is specified, it is
@ -1666,7 +1666,7 @@ dns_catz_generate_zonecfg(dns_catz_zone_t *zone, dns_catz_entry_t *entry,
DNS_NAME_FORMATSIZE);
isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL,
DNS_LOGMODULE_MASTER, ISC_LOG_ERROR,
"catz: zone '%s' uses an invalid master "
"catz: zone '%s' uses an invalid primary "
"(no IP address assigned)",
zname);
result = ISC_R_FAILURE;

2
lib/dns/include/dns/master.h
View file

@ -35,7 +35,7 @@
#define DNS_MASTER_NOINCLUDE 0x00000004 /*%< Disallow $INCLUDE directives. */
#define DNS_MASTER_ZONE 0x00000008 /*%< Loading a zone master file. */
#define DNS_MASTER_HINT 0x00000010 /*%< Loading a hint master file. */
#define DNS_MASTER_SLAVE 0x00000020 /*%< Loading a secondary master file. */
#define DNS_MASTER_SECONDARY 0x00000020 /*%< Secondary master file. */
#define DNS_MASTER_CHECKNS \
0x00000040 /*%< \
* Check NS records to see \

4
lib/dns/include/dns/xfrin.h
View file

@ -47,14 +47,14 @@ ISC_LANG_BEGINDECLS
isc_result_t
dns_xfrin_create(dns_zone_t *zone, dns_rdatatype_t xfrtype,
const isc_sockaddr_t *masteraddr,
const isc_sockaddr_t *primaryaddr,
const isc_sockaddr_t *sourceaddr, isc_dscp_t dscp,
dns_tsigkey_t *tsigkey, dns_transport_t *transport,
isc_mem_t *mctx, isc_nm_t *netmgr, dns_xfrindone_t done,
dns_xfrin_ctx_t **xfrp);
/*%<
* Attempt to start an incoming zone transfer of 'zone'
* from 'masteraddr', creating a dns_xfrin_ctx_t object to
* from 'primaryaddr', creating a dns_xfrin_ctx_t object to
* manage it. Attach '*xfrp' to the newly created object.
*
* Iff ISC_R_SUCCESS is returned, '*done' is called with

2
lib/dns/master.c
View file

@ -336,7 +336,7 @@ static dns_name_t const ip6_arpa = DNS_NAME_INITABSOLUTE(ip6_arpa_data,
static inline bool
dns_master_isprimary(dns_loadctx_t *lctx) {
return ((lctx->options & DNS_MASTER_ZONE) != 0 &&
(lctx->options & DNS_MASTER_SLAVE) == 0 &&
(lctx->options & DNS_MASTER_SECONDARY) == 0 &&
(lctx->options & DNS_MASTER_KEY) == 0);
}

48
lib/dns/xfrin.c
View file

@ -120,7 +120,7 @@ struct dns_xfrin_ctx {
dns_rdatatype_t reqtype;
isc_dscp_t dscp;
isc_sockaddr_t masteraddr;
isc_sockaddr_t primaryaddr;
isc_sockaddr_t sourceaddr;
isc_nmhandle_t *handle;
@ -196,7 +196,7 @@ struct dns_xfrin_ctx {
static void
xfrin_create(isc_mem_t *mctx, dns_zone_t *zone, dns_db_t *db, isc_nm_t *netmgr,
dns_name_t *zonename, dns_rdataclass_t rdclass,
dns_rdatatype_t reqtype, const isc_sockaddr_t *masteraddr,
dns_rdatatype_t reqtype, const isc_sockaddr_t *primaryaddr,
const isc_sockaddr_t *sourceaddr, isc_dscp_t dscp,
dns_tsigkey_t *tsigkey, dns_transport_t *transport,
dns_xfrin_ctx_t **xfrp);
@ -251,11 +251,11 @@ static isc_result_t
render(dns_message_t *msg, isc_mem_t *mctx, isc_buffer_t *buf);
static void
xfrin_logv(int level, const char *zonetext, const isc_sockaddr_t *masteraddr,
xfrin_logv(int level, const char *zonetext, const isc_sockaddr_t *primaryaddr,
const char *fmt, va_list ap) ISC_FORMAT_PRINTF(4, 0);
static void
xfrin_log1(int level, const char *zonetext, const isc_sockaddr_t *masteraddr,
xfrin_log1(int level, const char *zonetext, const isc_sockaddr_t *primaryaddr,
const char *fmt, ...) ISC_FORMAT_PRINTF(4, 5);
static void
@ -529,7 +529,7 @@ redo:
{
xfrin_log(xfr, ISC_LOG_DEBUG(3),
"requested serial %u, "
"master has %u, not updating",
"primary has %u, not updating",
xfr->ixfr.request_serial, xfr->end_serial);
FAIL(DNS_R_UPTODATE);
}
@ -564,7 +564,7 @@ redo:
*/
xfrin_log(xfr, ISC_LOG_DEBUG(3),
"requested serial %u, "
"master has %u, not updating",
"primary has %u, not updating",
xfr->ixfr.request_serial, xfr->end_serial);
FAIL(DNS_R_UPTODATE);
}
@ -690,7 +690,7 @@ failure:
isc_result_t
dns_xfrin_create(dns_zone_t *zone, dns_rdatatype_t xfrtype,
const isc_sockaddr_t *masteraddr,
const isc_sockaddr_t *primaryaddr,
const isc_sockaddr_t *sourceaddr, isc_dscp_t dscp,
dns_tsigkey_t *tsigkey, dns_transport_t *transport,
isc_mem_t *mctx, isc_nm_t *netmgr, dns_xfrindone_t done,
@ -702,7 +702,7 @@ dns_xfrin_create(dns_zone_t *zone, dns_rdatatype_t xfrtype,
REQUIRE(xfrp != NULL && *xfrp == NULL);
REQUIRE(done != NULL);
REQUIRE(isc_sockaddr_getport(masteraddr) != 0);
REQUIRE(isc_sockaddr_getport(primaryaddr) != 0);
(void)dns_zone_getdb(zone, &db);
@ -711,7 +711,7 @@ dns_xfrin_create(dns_zone_t *zone, dns_rdatatype_t xfrtype,
}
xfrin_create(mctx, zone, db, netmgr, zonename, dns_zone_getclass(zone),
xfrtype, masteraddr, sourceaddr, dscp, tsigkey, transport,
xfrtype, primaryaddr, sourceaddr, dscp, tsigkey, transport,
&xfr);
if (db != NULL) {
@ -745,7 +745,7 @@ dns_xfrin_create(dns_zone_t *zone, dns_rdatatype_t xfrtype,
if (result != ISC_R_SUCCESS) {
char zonetext[DNS_NAME_MAXTEXT + 32];
dns_zone_name(zone, zonetext, sizeof(zonetext));
xfrin_log1(ISC_LOG_ERROR, zonetext, masteraddr,
xfrin_log1(ISC_LOG_ERROR, zonetext, primaryaddr,
"zone transfer setup failed");
}
@ -857,7 +857,7 @@ xfrin_fail(dns_xfrin_ctx_t *xfr, isc_result_t result, const char *msg) {
static void
xfrin_create(isc_mem_t *mctx, dns_zone_t *zone, dns_db_t *db, isc_nm_t *netmgr,
dns_name_t *zonename, dns_rdataclass_t rdclass,
dns_rdatatype_t reqtype, const isc_sockaddr_t *masteraddr,
dns_rdatatype_t reqtype, const isc_sockaddr_t *primaryaddr,
const isc_sockaddr_t *sourceaddr, isc_dscp_t dscp,
dns_tsigkey_t *tsigkey, dns_transport_t *transport,
dns_xfrin_ctx_t **xfrp) {
@ -871,7 +871,7 @@ xfrin_create(isc_mem_t *mctx, dns_zone_t *zone, dns_db_t *db, isc_nm_t *netmgr,
.dscp = dscp,
.id = (dns_messageid_t)isc_random16(),
.maxrecords = dns_zone_getmaxrecords(zone),
.masteraddr = *masteraddr,
.primaryaddr = *primaryaddr,
.sourceaddr = *sourceaddr,
.firstsoa = DNS_RDATA_INIT };
@ -909,7 +909,7 @@ xfrin_create(isc_mem_t *mctx, dns_zone_t *zone, dns_db_t *db, isc_nm_t *netmgr,
dns_name_dup(zonename, mctx, &xfr->name);
INSIST(isc_sockaddr_pf(masteraddr) == isc_sockaddr_pf(sourceaddr));
INSIST(isc_sockaddr_pf(primaryaddr) == isc_sockaddr_pf(sourceaddr));
isc_sockaddr_setport(&xfr->sourceaddr, 0);
/*
@ -943,14 +943,14 @@ xfrin_start(dns_xfrin_ctx_t *xfr) {
switch (transport_type) {
case DNS_TRANSPORT_TCP:
isc_nm_tcpdnsconnect(xfr->netmgr, &xfr->sourceaddr,
&xfr->masteraddr, xfrin_connect_done,
&xfr->primaryaddr, xfrin_connect_done,
connect_xfr, 30000, 0);
break;
case DNS_TRANSPORT_TLS:
CHECK(isc_tlsctx_createclient(&xfr->tlsctx));
isc_tlsctx_enable_dot_client_alpn(xfr->tlsctx);
isc_nm_tlsdnsconnect(xfr->netmgr, &xfr->sourceaddr,
&xfr->masteraddr, xfrin_connect_done,
&xfr->primaryaddr, xfrin_connect_done,
connect_xfr, 30000, 0, xfr->tlsctx);
break;
default:
@ -1028,11 +1028,11 @@ xfrin_connect_done(isc_nmhandle_t *handle, isc_result_t result, void *cbarg) {
if (zmgr != NULL) {
if (result != ISC_R_SUCCESS) {
TIME_NOW(&now);
dns_zonemgr_unreachableadd(zmgr, &xfr->masteraddr,
dns_zonemgr_unreachableadd(zmgr, &xfr->primaryaddr,
&xfr->sourceaddr, &now);
CHECK(result);
} else {
dns_zonemgr_unreachabledel(zmgr, &xfr->masteraddr,
dns_zonemgr_unreachabledel(zmgr, &xfr->primaryaddr,
&xfr->sourceaddr);
}
}
@ -1656,17 +1656,17 @@ xfrin_destroy(dns_xfrin_ctx_t *xfr) {
* transfer of <zone> from <address>: <message>
*/
static void
xfrin_logv(int level, const char *zonetext, const isc_sockaddr_t *masteraddr,
xfrin_logv(int level, const char *zonetext, const isc_sockaddr_t *primaryaddr,
const char *fmt, va_list ap) {
char mastertext[ISC_SOCKADDR_FORMATSIZE];
char primarytext[ISC_SOCKADDR_FORMATSIZE];
char msgtext[2048];
isc_sockaddr_format(masteraddr, mastertext, sizeof(mastertext));
isc_sockaddr_format(primaryaddr, primarytext, sizeof(primarytext));
vsnprintf(msgtext, sizeof(msgtext), fmt, ap);
isc_log_write(dns_lctx, DNS_LOGCATEGORY_XFER_IN, DNS_LOGMODULE_XFER_IN,
level, "transfer of '%s' from %s: %s", zonetext,
mastertext, msgtext);
primarytext, msgtext);
}
/*
@ -1674,7 +1674,7 @@ xfrin_logv(int level, const char *zonetext, const isc_sockaddr_t *masteraddr,
*/
static void
xfrin_log1(int level, const char *zonetext, const isc_sockaddr_t *masteraddr,
xfrin_log1(int level, const char *zonetext, const isc_sockaddr_t *primaryaddr,
const char *fmt, ...) {
va_list ap;
@ -1683,7 +1683,7 @@ xfrin_log1(int level, const char *zonetext, const isc_sockaddr_t *masteraddr,
}
va_start(ap, fmt);
xfrin_logv(level, zonetext, masteraddr, fmt, ap);
xfrin_logv(level, zonetext, primaryaddr, fmt, ap);
va_end(ap);
}
@ -1703,6 +1703,6 @@ xfrin_log(dns_xfrin_ctx_t *xfr, int level, const char *fmt, ...) {
dns_zone_name(xfr->zone, zonetext, sizeof(zonetext));
va_start(ap, fmt);
xfrin_logv(level, zonetext, &xfr->masteraddr, fmt, ap);
xfrin_logv(level, zonetext, &xfr->primaryaddr, fmt, ap);
va_end(ap);
}

679
lib/dns/zone.c
View file

File diff suppressed because it is too large Load diff

2
lib/isc/include/isc/result.h
View file

@ -196,7 +196,7 @@ typedef enum isc_result {
DNS_R_MXISADDRESS,
DNS_R_DUPLICATE,
DNS_R_INVALIDNSEC3,
DNS_R_NOTMASTER,
DNS_R_NOTPRIMARY,
DNS_R_BROKENCHAIN,
DNS_R_EXPIRED,
DNS_R_NOTDYNAMIC,

4
lib/isc/result.c
View file

@ -194,7 +194,7 @@ static const char *description[ISC_R_NRESULTS] = {
[DNS_R_MXISADDRESS] = "MX is an address",
[DNS_R_DUPLICATE] = "duplicate query",
[DNS_R_INVALIDNSEC3] = "invalid NSEC3 owner name (wildcard)",
[DNS_R_NOTMASTER] = "not master",
[DNS_R_NOTPRIMARY] = "not primary",
[DNS_R_BROKENCHAIN] = "broken trust chain",
[DNS_R_EXPIRED] = "expired",
[DNS_R_NOTDYNAMIC] = "not dynamic",
@ -439,7 +439,7 @@ static const char *identifier[ISC_R_NRESULTS] = {
[DNS_R_MXISADDRESS] = "DNS_R_MXISADDRESS",
[DNS_R_DUPLICATE] = "DNS_R_DUPLICATE",
[DNS_R_INVALIDNSEC3] = "DNS_R_INVALIDNSEC3",
[DNS_R_NOTMASTER] = "DNS_R_NOTMASTER",
[DNS_R_NOTPRIMARY] = "DNS_R_NOTPRIMARY",
[DNS_R_BROKENCHAIN] = "DNS_R_BROKENCHAIN",
[DNS_R_EXPIRED] = "DNS_R_EXPIRED",
[DNS_R_NOTDYNAMIC] = "DNS_R_NOTDYNAMIC",

4
lib/ns/update.c
View file

@ -388,14 +388,14 @@ checkqueryacl(ns_client_t *client, dns_acl_t *queryacl, dns_name_t *zonename,
*/
static isc_result_t
checkupdateacl(ns_client_t *client, dns_acl_t *acl, const char *message,
dns_name_t *zonename, bool slave, bool has_ssutable) {
dns_name_t *zonename, bool secondary, bool has_ssutable) {
char namebuf[DNS_NAME_FORMATSIZE];
char classbuf[DNS_RDATACLASS_FORMATSIZE];
int level = ISC_LOG_ERROR;
const char *msg = "denied";
isc_result_t result;
if (slave && acl == NULL) {
if (secondary && acl == NULL) {
result = DNS_R_NOTIMP;
level = ISC_LOG_DEBUG(3);
msg = "disabled";