ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Merge branch '1432-dns_name_dup-post-cleanup' into 'main'

Browse Source 
Return void when ISC_R_SUCCESS is only returned value

Closes #1432

See merge request isc-projects/bind9!5471
This commit is contained in:
Ondřej Surý
2021-10-13 04:19:46 +00:00
parent e12240150d edfae82c82
commit 46fc798e66
48 changed files with 117 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/named/server.c
+9 -9
View File
@@ -5591,7 +5591,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config,
exclude = cfg_listelt_value(element);
CHECK(dns_name_fromstring(
name, cfg_obj_asstring(exclude), 0, NULL));
CHECK(dns_view_excludedelegationonly(view, name));
dns_view_excludedelegationonly(view, name);
}
} else {
dns_view_setrootdelonly(view, false);
@@ -6074,8 +6074,8 @@ configure_alternates(const cfg_obj_t *config, dns_view_t *view,
}
myport = (in_port_t)val;
}
CHECK(dns_resolver_addalternate(view->resolver, NULL,
name, myport));
dns_resolver_addalternate(view->resolver, NULL, name,
myport);
continue;
}
@@ -6083,7 +6083,7 @@ configure_alternates(const cfg_obj_t *config, dns_view_t *view,
if (isc_sockaddr_getport(&sa) == 0) {
isc_sockaddr_setport(&sa, port);
}
CHECK(dns_resolver_addalternate(view->resolver, &sa, NULL, 0));
dns_resolver_addalternate(view->resolver, &sa, NULL, 0);
}
cleanup:
@@ -6337,7 +6337,7 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig,
const cfg_obj_t *ixfrfromdiffs = NULL;
const cfg_obj_t *only = NULL;
const cfg_obj_t *viewobj = NULL;
isc_result_t result;
isc_result_t result = ISC_R_SUCCESS;
isc_result_t tresult;
isc_buffer_t buffer;
dns_fixedname_t fixorigin;
@@ -6472,7 +6472,7 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig,
&only);
if (tresult == ISC_R_SUCCESS && cfg_obj_asboolean(only))
{
CHECK(dns_view_adddelegationonly(view, origin));
dns_view_adddelegationonly(view, origin);
}
} else {
isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
@@ -6504,7 +6504,7 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig,
only = NULL;
tresult = cfg_map_get(zoptions, "delegation-only", &only);
if (tresult == ISC_R_SUCCESS && cfg_obj_asboolean(only)) {
CHECK(dns_view_adddelegationonly(view, origin));
dns_view_adddelegationonly(view, origin);
}
goto cleanup;
}
@@ -6513,7 +6513,7 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig,
* "delegation-only zones" aren't zones either.
*/
if (strcasecmp(ztypestr, "delegation-only") == 0) {
result = dns_view_adddelegationonly(view, origin);
dns_view_adddelegationonly(view, origin);
goto cleanup;
}
@@ -6679,7 +6679,7 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig,
only = NULL;
if (cfg_map_get(zoptions, "delegation-only", &only) == ISC_R_SUCCESS) {
if (cfg_obj_asboolean(only)) {
CHECK(dns_view_adddelegationonly(view, origin));
dns_view_adddelegationonly(view, origin);
}
}
bin/named/zoneconf.c
+19 -39
View File
@@ -202,7 +202,7 @@ configure_zone_ssutable(const cfg_obj_t *zconfig, dns_zone_t *zone,
dns_ssutable_t *table = NULL;
isc_mem_t *mctx = dns_zone_getmctx(zone);
bool autoddns = false;
isc_result_t result;
isc_result_t result = ISC_R_SUCCESS;
(void)cfg_map_get(zconfig, "update-policy", &updatepolicy);
@@ -218,10 +218,7 @@ configure_zone_ssutable(const cfg_obj_t *zconfig, dns_zone_t *zone,
updatepolicy = NULL;
}
result = dns_ssutable_create(mctx, &table);
if (result != ISC_R_SUCCESS) {
return (result);
}
dns_ssutable_create(mctx, &table);
for (element = cfg_list_first(updatepolicy); element != NULL;
element = cfg_list_next(element))
@@ -342,15 +339,12 @@ configure_zone_ssutable(const cfg_obj_t *zconfig, dns_zone_t *zone,
}
INSIST(i == n);
result = dns_ssutable_addrule(
table, grant, dns_fixedname_name(&fident), mtype,
dns_fixedname_name(&fname), n, types);
dns_ssutable_addrule(table, grant, dns_fixedname_name(&fident),
mtype, dns_fixedname_name(&fname), n,
types);
if (types != NULL) {
isc_mem_put(mctx, types, n * sizeof(*types));
}
if (result != ISC_R_SUCCESS) {
goto cleanup;
}
}
/*
@@ -371,17 +365,12 @@ configure_zone_ssutable(const cfg_obj_t *zconfig, dns_zone_t *zone,
goto cleanup;
}
result = dns_ssutable_addrule(
table, true, named_g_server->session_keyname,
dns_ssumatchtype_local, dns_zone_getorigin(zone), 1,
&any);
if (result != ISC_R_SUCCESS) {
goto cleanup;
}
dns_ssutable_addrule(table, true,
named_g_server->session_keyname,
dns_ssumatchtype_local,
dns_zone_getorigin(zone), 1, &any);
}
result = ISC_R_SUCCESS;
dns_zone_setssutable(zone, table);
cleanup:
@@ -1299,14 +1288,12 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
RETERR(named_config_getipandkeylist(config, "primaries",
obj, mctx, &ipkl));
result = dns_zone_setalsonotify(zone, ipkl.addrs,
ipkl.dscps, ipkl.keys,
ipkl.tlss, ipkl.count);
dns_zone_setalsonotify(zone, ipkl.addrs, ipkl.dscps,
ipkl.keys, ipkl.tlss,
ipkl.count);
dns_ipkeylist_clear(mctx, &ipkl);
RETERR(result);
} else {
RETERR(dns_zone_setalsonotify(zone, NULL, NULL, NULL,
NULL, 0));
dns_zone_setalsonotify(zone, NULL, NULL, NULL, NULL, 0);
}
obj = NULL;
@@ -1734,14 +1721,11 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
dns_ipkeylist_init(&ipkl);
RETERR(named_config_getipandkeylist(
config, "parental-agents", obj, mctx, &ipkl));
result = dns_zone_setparentals(zone, ipkl.addrs,
ipkl.keys, ipkl.tlss,
ipkl.count);
dns_zone_setparentals(zone, ipkl.addrs, ipkl.keys,
ipkl.tlss, ipkl.count);
dns_ipkeylist_clear(mctx, &ipkl);
RETERR(result);
} else {
RETERR(dns_zone_setparentals(zone, NULL, NULL, NULL,
0));
dns_zone_setparentals(zone, NULL, NULL, NULL, 0);
}
}
@@ -1917,17 +1901,13 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
RETERR(named_config_getipandkeylist(config, "primaries",
obj, mctx, &ipkl));
result = dns_zone_setprimaries(mayberaw, ipkl.addrs,
ipkl.keys, ipkl.tlss,
ipkl.count);
dns_zone_setprimaries(mayberaw, ipkl.addrs, ipkl.keys,
ipkl.tlss, ipkl.count);
count = ipkl.count;
dns_ipkeylist_clear(mctx, &ipkl);
RETERR(result);
} else {
result = dns_zone_setprimaries(mayberaw, NULL, NULL,
NULL, 0);
dns_zone_setprimaries(mayberaw, NULL, NULL, NULL, 0);
}
RETERR(result);
multi = false;
if (count > 1) {
lib/dns/catz.c
+10 -33
View File
@@ -145,7 +145,7 @@ dns_catz_options_free(dns_catz_options_t *options, isc_mem_t *mctx) {
}
}
isc_result_t
void
dns_catz_options_copy(isc_mem_t *mctx, const dns_catz_options_t *src,
dns_catz_options_t *dst) {
REQUIRE(mctx != NULL);
@@ -175,11 +175,9 @@ dns_catz_options_copy(isc_mem_t *mctx, const dns_catz_options_t *src,
if (src->allow_transfer != NULL) {
isc_buffer_dup(mctx, &dst->allow_transfer, src->allow_transfer);
}
return (ISC_R_SUCCESS);
}
isc_result_t
void
dns_catz_options_setdefault(isc_mem_t *mctx, const dns_catz_options_t *defaults,
dns_catz_options_t *opts) {
REQUIRE(mctx != NULL);
@@ -204,10 +202,9 @@ dns_catz_options_setdefault(isc_mem_t *mctx, const dns_catz_options_t *defaults,
/* This option is always taken from config, so it's always 'default' */
opts->in_memory = defaults->in_memory;
return (ISC_R_SUCCESS);
}
isc_result_t
void
dns_catz_entry_new(isc_mem_t *mctx, const dns_name_t *domain,
dns_catz_entry_t **nentryp) {
dns_catz_entry_t *nentry;
@@ -226,7 +223,6 @@ dns_catz_entry_new(isc_mem_t *mctx, const dns_name_t *domain,
isc_refcount_init(&nentry->refs, 1);
nentry->magic = DNS_CATZ_ENTRY_MAGIC;
*nentryp = nentry;
return (ISC_R_SUCCESS);
}
dns_name_t *
@@ -235,29 +231,19 @@ dns_catz_entry_getname(dns_catz_entry_t *entry) {
return (&entry->name);
}
isc_result_t
void
dns_catz_entry_copy(dns_catz_zone_t *zone, const dns_catz_entry_t *entry,
dns_catz_entry_t **nentryp) {
isc_result_t result;
dns_catz_entry_t *nentry = NULL;
REQUIRE(DNS_CATZ_ZONE_VALID(zone));
REQUIRE(DNS_CATZ_ENTRY_VALID(entry));
REQUIRE(nentryp != NULL && *nentryp == NULL);
result = dns_catz_entry_new(zone->catzs->mctx, &entry->name, &nentry);
if (result != ISC_R_SUCCESS) {
return (result);
}
result = dns_catz_options_copy(zone->catzs->mctx, &entry->opts,
&nentry->opts);
if (result != ISC_R_SUCCESS) {
dns_catz_entry_detach(zone, &nentry);
}
dns_catz_entry_new(zone->catzs->mctx, &entry->name, &nentry);
dns_catz_options_copy(zone->catzs->mctx, &entry->opts, &nentry->opts);
*nentryp = nentry;
return (result);
}
void
@@ -986,12 +972,7 @@ catz_process_zones_entry(dns_catz_zone_t *zone, dns_rdataset_t *value,
dns_name_dup(&ptr.ptr, zone->catzs->mctx, &entry->name);
}
} else {
result = dns_catz_entry_new(zone->catzs->mctx, &ptr.ptr,
&entry);
if (result != ISC_R_SUCCESS) {
dns_rdata_freestruct(&ptr);
return (result);
}
dns_catz_entry_new(zone->catzs->mctx, &ptr.ptr, &entry);
result = isc_ht_add(zone->entries, mhash->base, mhash->length,
entry);
@@ -1082,7 +1063,6 @@ catz_process_primaries(dns_catz_zone_t *zone, dns_ipkeylist_t *ipkl,
char keycbuf[DNS_NAME_FORMATSIZE];
isc_buffer_t keybuf;
unsigned int rcount;
unsigned int i;
REQUIRE(DNS_CATZ_ZONE_VALID(zone));
REQUIRE(ipkl != NULL);
@@ -1108,6 +1088,7 @@ catz_process_primaries(dns_catz_zone_t *zone, dns_ipkeylist_t *ipkl,
if (name->labels > 0) {
isc_sockaddr_t sockaddr;
size_t i;
/*
* We're pre-preparing the data once, we'll put it into
@@ -1354,10 +1335,7 @@ catz_process_zones_suboption(dns_catz_zone_t *zone, dns_rdataset_t *value,
result = isc_ht_find(zone->entries, mhash->base, mhash->length,
(void **)&entry);
if (result != ISC_R_SUCCESS) {
result = dns_catz_entry_new(zone->catzs->mctx, NULL, &entry);
if (result != ISC_R_SUCCESS) {
return (result);
}
dns_catz_entry_new(zone->catzs->mctx, NULL, &entry);
result = isc_ht_add(zone->entries, mhash->base, mhash->length,
entry);
if (result != ISC_R_SUCCESS) {
@@ -1505,10 +1483,9 @@ static isc_result_t
digest2hex(unsigned char *digest, unsigned int digestlen, char *hash,
size_t hashlen) {
unsigned int i;
int ret;
for (i = 0; i < digestlen; i++) {
size_t left = hashlen - i * 2;
ret = snprintf(hash + i * 2, left, "%02x", digest[i]);
int ret = snprintf(hash + i * 2, left, "%02x", digest[i]);
if (ret < 0 || (size_t)ret >= left) {
return (ISC_R_NOSPACE);
}
lib/dns/dlz.c
+1 -5
View File
@@ -464,11 +464,7 @@ dns_dlz_writeablezone(dns_view_t *view, dns_dlzdb_t *dlzdb,
dns_zone_setadded(zone, true);
if (dlzdb->ssutable == NULL) {
result = dns_ssutable_createdlz(dlzdb->mctx, &dlzdb->ssutable,
dlzdb);
if (result != ISC_R_SUCCESS) {
goto cleanup;
}
dns_ssutable_createdlz(dlzdb->mctx, &dlzdb->ssutable, dlzdb);
}
dns_zone_setssutable(zone, dlzdb->ssutable);
lib/dns/include/dns/catz.h
+4 -4
View File
@@ -90,7 +90,7 @@ dns_catz_options_free(dns_catz_options_t *options, isc_mem_t *mctx);
* \li 'mctx' to be a valid memory context.
*/
isc_result_t
void
dns_catz_options_copy(isc_mem_t *mctx, const dns_catz_options_t *opts,
dns_catz_options_t *nopts);
/*%<
@@ -102,7 +102,7 @@ dns_catz_options_copy(isc_mem_t *mctx, const dns_catz_options_t *opts,
* \li 'nopts' to be non NULL.
*/
isc_result_t
void
dns_catz_options_setdefault(isc_mem_t *mctx, const dns_catz_options_t *defaults,
dns_catz_options_t *opts);
/*%<
@@ -126,7 +126,7 @@ dns_catz_entry_getname(dns_catz_entry_t *entry);
* \li domain name for entry.
*/
isc_result_t
void
dns_catz_entry_new(isc_mem_t *mctx, const dns_name_t *domain,
dns_catz_entry_t **nentryp);
/*%<
@@ -142,7 +142,7 @@ dns_catz_entry_new(isc_mem_t *mctx, const dns_name_t *domain,
* \li ISC_R_NOMEMORY on allocation failure
*/
isc_result_t
void
dns_catz_entry_copy(dns_catz_zone_t *zone, const dns_catz_entry_t *entry,
dns_catz_entry_t **nentryp);
/*%<
lib/dns/include/dns/resolver.h
+1 -1
View File
@@ -434,7 +434,7 @@ dns_resolver_setlamettl(dns_resolver_t *resolver, uint32_t lame_ttl);
*\li 'resolver' to be valid.
*/
isc_result_t
void
dns_resolver_addalternate(dns_resolver_t *resolver, const isc_sockaddr_t *alt,
const dns_name_t *name, in_port_t port);
/*%<
lib/dns/include/dns/ssu.h
+3 -3
View File
@@ -52,7 +52,7 @@ typedef struct dns_ssuruletype {
unsigned int max; /* maximum number of records allowed. */
} dns_ssuruletype_t;
isc_result_t
void
dns_ssutable_create(isc_mem_t *mctx, dns_ssutable_t **table);
/*%<
* Creates a table that will be used to store simple-secure-update rules.
@@ -67,7 +67,7 @@ dns_ssutable_create(isc_mem_t *mctx, dns_ssutable_t **table);
*\li ISC_R_NOMEMORY
*/
isc_result_t
void
dns_ssutable_createdlz(isc_mem_t *mctx, dns_ssutable_t **tablep,
dns_dlzdb_t *dlzdatabase);
/*%<
@@ -104,7 +104,7 @@ dns_ssutable_detach(dns_ssutable_t **tablep);
* resources used by the table will be freed.
*/
isc_result_t
void
dns_ssutable_addrule(dns_ssutable_t *table, bool grant,
const dns_name_t *identity, dns_ssumatchtype_t matchtype,
const dns_name_t *name, unsigned int ntypes,
lib/dns/include/dns/view.h
+2 -2
View File
@@ -952,7 +952,7 @@ dns_view_flushname(dns_view_t *view, const dns_name_t *name);
* other returns are failures.
*/
isc_result_t
void
dns_view_adddelegationonly(dns_view_t *view, const dns_name_t *name);
/*%<
* Add the given name to the delegation only table.
@@ -966,7 +966,7 @@ dns_view_adddelegationonly(dns_view_t *view, const dns_name_t *name);
*\li #ISC_R_NOMEMORY
*/
isc_result_t
void
dns_view_excludedelegationonly(dns_view_t *view, const dns_name_t *name);
/*%<
* Add the given name to be excluded from the root-delegation-only.
lib/dns/include/dns/zone.h
+4 -4
View File
@@ -639,7 +639,7 @@ dns_zone_maintenance(dns_zone_t *zone);
*\li 'zone' to be a valid zone.
*/
isc_result_t
void
dns_zone_setprimaries(dns_zone_t *zone, const isc_sockaddr_t *primaries,
dns_name_t **keynames, dns_name_t **tlsnames,
uint32_t count);
@@ -660,7 +660,7 @@ dns_zone_setprimaries(dns_zone_t *zone, const isc_sockaddr_t *primaries,
*\li Any result dns_name_dup() can return, if keynames!=NULL
*/
isc_result_t
void
dns_zone_setparentals(dns_zone_t *zone, const isc_sockaddr_t *parentals,
dns_name_t **keynames, dns_name_t **tlsnames,
uint32_t count);
@@ -681,7 +681,7 @@ dns_zone_setparentals(dns_zone_t *zone, const isc_sockaddr_t *parentals,
*\li Any result dns_name_dup() can return, if keynames!=NULL
*/
isc_result_t
void
dns_zone_setparentals(dns_zone_t *zone, const isc_sockaddr_t *parentals,
dns_name_t **keynames, dns_name_t **tlsnames,
uint32_t count);
@@ -702,7 +702,7 @@ dns_zone_setparentals(dns_zone_t *zone, const isc_sockaddr_t *parentals,
*\li Any result dns_name_dup() can return, if keynames!=NULL
*/
isc_result_t
void
dns_zone_setalsonotify(dns_zone_t *zone, const isc_sockaddr_t *notify,
const isc_dscp_t *dscps, dns_name_t **keynames,
dns_name_t **tlsnames, uint32_t count);
lib/dns/lookup.c
+2 -4
View File
@@ -90,7 +90,7 @@ start_fetch(dns_lookup_t *lookup) {
return (result);
}
static isc_result_t
static void
build_event(dns_lookup_t *lookup) {
dns_name_t *name = NULL;
dns_rdataset_t *rdataset = NULL;
@@ -115,8 +115,6 @@ build_event(dns_lookup_t *lookup) {
lookup->event->name = name;
lookup->event->rdataset = rdataset;
lookup->event->sigrdataset = sigrdataset;
return (ISC_R_SUCCESS);
}
static isc_result_t
@@ -216,7 +214,7 @@ lookup_find(dns_lookup_t *lookup, dns_fetchevent_t *event) {
switch (result) {
case ISC_R_SUCCESS:
result = build_event(lookup);
build_event(lookup);
if (event == NULL) {
break;
}
lib/dns/rdata.c
+1 -2
View File
@@ -407,14 +407,13 @@ locator_pton(const char *src, unsigned char *dst) {
return (1);
}
static inline isc_result_t
static inline void
name_duporclone(const dns_name_t *source, isc_mem_t *mctx, dns_name_t *target) {
if (mctx != NULL) {
dns_name_dup(source, mctx, target);
} else {
dns_name_clone(source, target);
}
return (ISC_R_SUCCESS);
}
static inline void *
lib/dns/rdata/any_255/tsig_250.c
+1 -1
View File
@@ -462,7 +462,7 @@ tostruct_any_tsig(ARGS_TOSTRUCT) {
dns_name_init(&alg, NULL);
dns_name_fromregion(&alg, &sr);
dns_name_init(&tsig->algorithm, NULL);
RETERR(name_duporclone(&alg, mctx, &tsig->algorithm));
name_duporclone(&alg, mctx, &tsig->algorithm);
isc_region_consume(&sr, name_length(&tsig->algorithm));
lib/dns/rdata/ch_3/a_1.c
+1 -1
View File
@@ -234,7 +234,7 @@ tostruct_ch_a(ARGS_TOSTRUCT) {
isc_region_consume(&region, name_length(&name));
dns_name_init(&a->ch_addr_dom, NULL);
RETERR(name_duporclone(&name, mctx, &a->ch_addr_dom));
name_duporclone(&name, mctx, &a->ch_addr_dom);
a->ch_addr = htons(uint16_fromregion(&region));
a->mctx = mctx;
return (ISC_R_SUCCESS);
lib/dns/rdata/generic/afsdb_18.c
+1 -1
View File
@@ -219,7 +219,7 @@ tostruct_afsdb(ARGS_TOSTRUCT) {
dns_name_init(&name, NULL);
dns_name_fromregion(&name, &region);
RETERR(name_duporclone(&name, mctx, &afsdb->server));
name_duporclone(&name, mctx, &afsdb->server);
afsdb->mctx = mctx;
return (ISC_R_SUCCESS);
}
lib/dns/rdata/generic/amtrelay_260.c
+1 -1
View File
@@ -350,7 +350,7 @@ tostruct_amtrelay(ARGS_TOSTRUCT) {
case 3:
dns_name_fromregion(&name, &region);
RETERR(name_duporclone(&name, mctx, &amtrelay->gateway));
name_duporclone(&name, mctx, &amtrelay->gateway);
isc_region_consume(&region, name_length(&name));
break;
lib/dns/rdata/generic/cname_5.c
+1 -1
View File
@@ -153,7 +153,7 @@ tostruct_cname(ARGS_TOSTRUCT) {
dns_rdata_toregion(rdata, &region);
dns_name_fromregion(&name, &region);
dns_name_init(&cname->cname, NULL);
RETERR(name_duporclone(&name, mctx, &cname->cname));
name_duporclone(&name, mctx, &cname->cname);
cname->mctx = mctx;
return (ISC_R_SUCCESS);
}
lib/dns/rdata/generic/dname_39.c
+1 -1
View File
@@ -153,7 +153,7 @@ tostruct_dname(ARGS_TOSTRUCT) {
dns_rdata_toregion(rdata, &region);
dns_name_fromregion(&name, &region);
dns_name_init(&dname->dname, NULL);
RETERR(name_duporclone(&name, mctx, &dname->dname));
name_duporclone(&name, mctx, &dname->dname);
dname->mctx = mctx;
return (ISC_R_SUCCESS);
}
lib/dns/rdata/generic/ipseckey_45.c
+1 -1
View File
@@ -389,7 +389,7 @@ tostruct_ipseckey(ARGS_TOSTRUCT) {
case 3:
dns_name_init(&ipseckey->gateway, NULL);
dns_name_fromregion(&name, &region);
RETERR(name_duporclone(&name, mctx, &ipseckey->gateway));
name_duporclone(&name, mctx, &ipseckey->gateway);
isc_region_consume(&region, name_length(&name));
break;
}
lib/dns/rdata/generic/lp_107.c
+1 -1
View File
@@ -164,7 +164,7 @@ tostruct_lp(ARGS_TOSTRUCT) {
isc_region_consume(&region, 2);
dns_name_fromregion(&name, &region);
dns_name_init(&lp->lp, NULL);
RETERR(name_duporclone(&name, mctx, &lp->lp));
name_duporclone(&name, mctx, &lp->lp);
lp->mctx = mctx;
return (ISC_R_SUCCESS);
}
lib/dns/rdata/generic/mb_7.c
+1 -1
View File
@@ -152,7 +152,7 @@ tostruct_mb(ARGS_TOSTRUCT) {
dns_rdata_toregion(rdata, &region);
dns_name_fromregion(&name, &region);
dns_name_init(&mb->mb, NULL);
RETERR(name_duporclone(&name, mctx, &mb->mb));
name_duporclone(&name, mctx, &mb->mb);
mb->mctx = mctx;
return (ISC_R_SUCCESS);
}
lib/dns/rdata/generic/md_3.c
+1 -1
View File
@@ -152,7 +152,7 @@ tostruct_md(ARGS_TOSTRUCT) {
dns_rdata_toregion(rdata, &r);
dns_name_fromregion(&name, &r);
dns_name_init(&md->md, NULL);
RETERR(name_duporclone(&name, mctx, &md->md));
name_duporclone(&name, mctx, &md->md);
md->mctx = mctx;
return (ISC_R_SUCCESS);
}
lib/dns/rdata/generic/mf_4.c
+1 -1
View File
@@ -152,7 +152,7 @@ tostruct_mf(ARGS_TOSTRUCT) {
dns_rdata_toregion(rdata, &r);
dns_name_fromregion(&name, &r);
dns_name_init(&mf->mf, NULL);
RETERR(name_duporclone(&name, mctx, &mf->mf));
name_duporclone(&name, mctx, &mf->mf);
mf->mctx = mctx;
return (ISC_R_SUCCESS);
}
lib/dns/rdata/generic/mg_8.c
+1 -1
View File
@@ -152,7 +152,7 @@ tostruct_mg(ARGS_TOSTRUCT) {
dns_rdata_toregion(rdata, &region);
dns_name_fromregion(&name, &region);
dns_name_init(&mg->mg, NULL);
RETERR(name_duporclone(&name, mctx, &mg->mg));
name_duporclone(&name, mctx, &mg->mg);
mg->mctx = mctx;
return (ISC_R_SUCCESS);
}
lib/dns/rdata/generic/minfo_14.c
+2 -12
View File
@@ -199,7 +199,6 @@ tostruct_minfo(ARGS_TOSTRUCT) {
dns_rdata_minfo_t *minfo = target;
isc_region_t region;
dns_name_t name;
isc_result_t result;
REQUIRE(rdata->type == dns_rdatatype_minfo);
REQUIRE(minfo != NULL);
@@ -213,23 +212,14 @@ tostruct_minfo(ARGS_TOSTRUCT) {
dns_rdata_toregion(rdata, &region);
dns_name_fromregion(&name, &region);
dns_name_init(&minfo->rmailbox, NULL);
RETERR(name_duporclone(&name, mctx, &minfo->rmailbox));
name_duporclone(&name, mctx, &minfo->rmailbox);
isc_region_consume(&region, name_length(&name));
dns_name_fromregion(&name, &region);
dns_name_init(&minfo->emailbox, NULL);
result = name_duporclone(&name, mctx, &minfo->emailbox);
if (result != ISC_R_SUCCESS) {
goto cleanup;
}
name_duporclone(&name, mctx, &minfo->emailbox);
minfo->mctx = mctx;
return (ISC_R_SUCCESS);
cleanup:
if (mctx != NULL) {
dns_name_free(&minfo->rmailbox, mctx);
}
return (ISC_R_NOMEMORY);
}
static inline void
lib/dns/rdata/generic/mr_9.c
+1 -1
View File
@@ -152,7 +152,7 @@ tostruct_mr(ARGS_TOSTRUCT) {
dns_rdata_toregion(rdata, &region);
dns_name_fromregion(&name, &region);
dns_name_init(&mr->mr, NULL);
RETERR(name_duporclone(&name, mctx, &mr->mr));
name_duporclone(&name, mctx, &mr->mr);
mr->mctx = mctx;
return (ISC_R_SUCCESS);
}
lib/dns/rdata/generic/mx_15.c
+1 -1
View File
@@ -238,7 +238,7 @@ tostruct_mx(ARGS_TOSTRUCT) {
isc_region_consume(&region, 2);
dns_name_fromregion(&name, &region);
dns_name_init(&mx->mx, NULL);
RETERR(name_duporclone(&name, mctx, &mx->mx));
name_duporclone(&name, mctx, &mx->mx);
mx->mctx = mctx;
return (ISC_R_SUCCESS);
}
lib/dns/rdata/generic/naptr_35.c
+1 -5
View File
@@ -493,7 +493,6 @@ static inline isc_result_t
tostruct_naptr(ARGS_TOSTRUCT) {
dns_rdata_naptr_t *naptr = target;
isc_region_t r;
isc_result_t result;
dns_name_t name;
REQUIRE(rdata->type == dns_rdatatype_naptr);
@@ -546,10 +545,7 @@ tostruct_naptr(ARGS_TOSTRUCT) {
dns_name_init(&name, NULL);
dns_name_fromregion(&name, &r);
dns_name_init(&naptr->replacement, NULL);
result = name_duporclone(&name, mctx, &naptr->replacement);
if (result != ISC_R_SUCCESS) {
goto cleanup;
}
name_duporclone(&name, mctx, &naptr->replacement);
naptr->mctx = mctx;
return (ISC_R_SUCCESS);
lib/dns/rdata/generic/ns_2.c
+1 -1
View File
@@ -163,7 +163,7 @@ tostruct_ns(ARGS_TOSTRUCT) {
dns_rdata_toregion(rdata, &region);
dns_name_fromregion(&name, &region);
dns_name_init(&ns->name, NULL);
RETERR(name_duporclone(&name, mctx, &ns->name));
name_duporclone(&name, mctx, &ns->name);
ns->mctx = mctx;
return (ISC_R_SUCCESS);
}
lib/dns/rdata/generic/nsec_47.c
+1 -1
View File
@@ -172,7 +172,7 @@ tostruct_nsec(ARGS_TOSTRUCT) {
dns_name_fromregion(&name, &region);
isc_region_consume(&region, name_length(&name));
dns_name_init(&nsec->next, NULL);
RETERR(name_duporclone(&name, mctx, &nsec->next));
name_duporclone(&name, mctx, &nsec->next);
nsec->len = region.length;
nsec->typebits = mem_maybedup(mctx, region.base, region.length);
lib/dns/rdata/generic/nxt_30.c
+1 -1
View File
@@ -251,7 +251,7 @@ tostruct_nxt(ARGS_TOSTRUCT) {
dns_name_fromregion(&name, &region);
isc_region_consume(&region, name_length(&name));
dns_name_init(&nxt->next, NULL);
RETERR(name_duporclone(&name, mctx, &nxt->next));
name_duporclone(&name, mctx, &nxt->next);
nxt->len = region.length;
nxt->typebits = mem_maybedup(mctx, region.base, region.length);
lib/dns/rdata/generic/ptr_12.c
+1 -1
View File
@@ -165,7 +165,7 @@ tostruct_ptr(ARGS_TOSTRUCT) {
dns_rdata_toregion(rdata, &region);
dns_name_fromregion(&name, &region);
dns_name_init(&ptr->ptr, NULL);
RETERR(name_duporclone(&name, mctx, &ptr->ptr));
name_duporclone(&name, mctx, &ptr->ptr);
ptr->mctx = mctx;
return (ISC_R_SUCCESS);
}
lib/dns/rdata/generic/rp_17.c
+2 -13
View File
@@ -195,7 +195,6 @@ fromstruct_rp(ARGS_FROMSTRUCT) {
static inline isc_result_t
tostruct_rp(ARGS_TOSTRUCT) {
isc_result_t result;
isc_region_t region;
dns_rdata_rp_t *rp = target;
dns_name_t name;
@@ -212,23 +211,13 @@ tostruct_rp(ARGS_TOSTRUCT) {
dns_rdata_toregion(rdata, &region);
dns_name_fromregion(&name, &region);
dns_name_init(&rp->mail, NULL);
RETERR(name_duporclone(&name, mctx, &rp->mail));
name_duporclone(&name, mctx, &rp->mail);
isc_region_consume(&region, name_length(&name));
dns_name_fromregion(&name, &region);
dns_name_init(&rp->text, NULL);
result = name_duporclone(&name, mctx, &rp->text);
if (result != ISC_R_SUCCESS) {
goto cleanup;
}
name_duporclone(&name, mctx, &rp->text);
rp->mctx = mctx;
return (ISC_R_SUCCESS);
cleanup:
if (mctx != NULL) {
dns_name_free(&rp->mail, mctx);
}
return (ISC_R_NOMEMORY);
}
static inline void
lib/dns/rdata/generic/rrsig_46.c
+1 -1
View File
@@ -491,7 +491,7 @@ tostruct_rrsig(ARGS_TOSTRUCT) {
dns_name_init(&signer, NULL);
dns_name_fromregion(&signer, &sr);
dns_name_init(&sig->signer, NULL);
RETERR(name_duporclone(&signer, mctx, &sig->signer));
name_duporclone(&signer, mctx, &sig->signer);
isc_region_consume(&sr, name_length(&sig->signer));
/*
lib/dns/rdata/generic/rt_21.c
+1 -1
View File
@@ -211,7 +211,7 @@ tostruct_rt(ARGS_TOSTRUCT) {
isc_region_consume(&region, 2);
dns_name_fromregion(&name, &region);
dns_name_init(&rt->host, NULL);
RETERR(name_duporclone(&name, mctx, &rt->host));
name_duporclone(&name, mctx, &rt->host);
rt->mctx = mctx;
return (ISC_R_SUCCESS);
lib/dns/rdata/generic/sig_24.c
+1 -1
View File
@@ -483,7 +483,7 @@ tostruct_sig(ARGS_TOSTRUCT) {
dns_name_init(&signer, NULL);
dns_name_fromregion(&signer, &sr);
dns_name_init(&sig->signer, NULL);
RETERR(name_duporclone(&signer, mctx, &sig->signer));
name_duporclone(&signer, mctx, &sig->signer);
isc_region_consume(&sr, name_length(&sig->signer));
/*
lib/dns/rdata/generic/soa_6.c
+2 -12
View File
@@ -302,7 +302,6 @@ tostruct_soa(ARGS_TOSTRUCT) {
isc_region_t region;
dns_rdata_soa_t *soa = target;
dns_name_t name;
isc_result_t result;
REQUIRE(rdata->type == dns_rdatatype_soa);
REQUIRE(soa != NULL);
@@ -318,15 +317,12 @@ tostruct_soa(ARGS_TOSTRUCT) {
dns_name_fromregion(&name, &region);
isc_region_consume(&region, name_length(&name));
dns_name_init(&soa->origin, NULL);
RETERR(name_duporclone(&name, mctx, &soa->origin));
name_duporclone(&name, mctx, &soa->origin);
dns_name_fromregion(&name, &region);
isc_region_consume(&region, name_length(&name));
dns_name_init(&soa->contact, NULL);
result = name_duporclone(&name, mctx, &soa->contact);
if (result != ISC_R_SUCCESS) {
goto cleanup;
}
name_duporclone(&name, mctx, &soa->contact);
soa->serial = uint32_fromregion(&region);
isc_region_consume(&region, 4);
@@ -344,12 +340,6 @@ tostruct_soa(ARGS_TOSTRUCT) {
soa->mctx = mctx;
return (ISC_R_SUCCESS);
cleanup:
if (mctx != NULL) {
dns_name_free(&soa->origin, mctx);
}
return (ISC_R_NOMEMORY);
}
static inline void
lib/dns/rdata/generic/talink_58.c
+2 -12
View File
@@ -162,7 +162,6 @@ tostruct_talink(ARGS_TOSTRUCT) {
isc_region_t region;
dns_rdata_talink_t *talink = target;
dns_name_t name;
isc_result_t result;
REQUIRE(rdata->type == dns_rdatatype_talink);
REQUIRE(talink != NULL);
@@ -178,24 +177,15 @@ tostruct_talink(ARGS_TOSTRUCT) {
dns_name_fromregion(&name, &region);
isc_region_consume(&region, name_length(&name));
dns_name_init(&talink->prev, NULL);
RETERR(name_duporclone(&name, mctx, &talink->prev));
name_duporclone(&name, mctx, &talink->prev);
dns_name_fromregion(&name, &region);
isc_region_consume(&region, name_length(&name));
dns_name_init(&talink->next, NULL);
result = name_duporclone(&name, mctx, &talink->next);
if (result != ISC_R_SUCCESS) {
goto cleanup;
}
name_duporclone(&name, mctx, &talink->next);
talink->mctx = mctx;
return (ISC_R_SUCCESS);
cleanup:
if (mctx != NULL) {
dns_name_free(&talink->prev, mctx);
}
return (ISC_R_NOMEMORY);
}
static inline void
lib/dns/rdata/generic/tkey_249.c
+1 -1
View File
@@ -434,7 +434,7 @@ tostruct_tkey(ARGS_TOSTRUCT) {
dns_name_init(&alg, NULL);
dns_name_fromregion(&alg, &sr);
dns_name_init(&tkey->algorithm, NULL);
RETERR(name_duporclone(&alg, mctx, &tkey->algorithm));
name_duporclone(&alg, mctx, &tkey->algorithm);
isc_region_consume(&sr, name_length(&tkey->algorithm));
/*
lib/dns/rdata/in_1/a6_38.c
+1 -1
View File
@@ -371,7 +371,7 @@ tostruct_in_a6(ARGS_TOSTRUCT) {
if (a6->prefixlen != 0) {
dns_name_init(&name, NULL);
dns_name_fromregion(&name, &r);
RETERR(name_duporclone(&name, mctx, &a6->prefix));
name_duporclone(&name, mctx, &a6->prefix);
}
a6->mctx = mctx;
return (ISC_R_SUCCESS);
lib/dns/rdata/in_1/kx_36.c
+1 -1
View File
@@ -198,7 +198,7 @@ tostruct_in_kx(ARGS_TOSTRUCT) {
dns_name_fromregion(&name, &region);
dns_name_init(&kx->exchange, NULL);
RETERR(name_duporclone(&name, mctx, &kx->exchange));
name_duporclone(&name, mctx, &kx->exchange);
kx->mctx = mctx;
return (ISC_R_SUCCESS);
}
lib/dns/rdata/in_1/nsap-ptr_23.c
+1 -1
View File
@@ -160,7 +160,7 @@ tostruct_in_nsap_ptr(ARGS_TOSTRUCT) {
dns_rdata_toregion(rdata, &region);
dns_name_fromregion(&name, &region);
dns_name_init(&nsap_ptr->owner, NULL);
RETERR(name_duporclone(&name, mctx, &nsap_ptr->owner));
name_duporclone(&name, mctx, &nsap_ptr->owner);
nsap_ptr->mctx = mctx;
return (ISC_R_SUCCESS);
}
lib/dns/rdata/in_1/px_26.c
+3 -11
View File
@@ -248,7 +248,6 @@ tostruct_in_px(ARGS_TOSTRUCT) {
dns_rdata_in_px_t *px = target;
dns_name_t name;
isc_region_t region;
isc_result_t result;
REQUIRE(rdata->type == dns_rdatatype_px);
REQUIRE(rdata->rdclass == dns_rdataclass_in);
@@ -268,21 +267,14 @@ tostruct_in_px(ARGS_TOSTRUCT) {
dns_name_fromregion(&name, &region);
dns_name_init(&px->map822, NULL);
RETERR(name_duporclone(&name, mctx, &px->map822));
name_duporclone(&name, mctx, &px->map822);
isc_region_consume(&region, name_length(&px->map822));
dns_name_init(&px->mapx400, NULL);
result = name_duporclone(&name, mctx, &px->mapx400);
if (result != ISC_R_SUCCESS) {
goto cleanup;
}
name_duporclone(&name, mctx, &px->mapx400);
px->mctx = mctx;
return (result);
cleanup:
dns_name_free(&px->map822, mctx);
return (ISC_R_NOMEMORY);
return (ISC_R_SUCCESS);
}
static inline void
lib/dns/rdata/in_1/srv_33.c
+1 -1
View File
@@ -279,7 +279,7 @@ tostruct_in_srv(ARGS_TOSTRUCT) {
isc_region_consume(&region, 2);
dns_name_fromregion(&name, &region);
dns_name_init(&srv->target, NULL);
RETERR(name_duporclone(&name, mctx, &srv->target));
name_duporclone(&name, mctx, &srv->target);
srv->mctx = mctx;
return (ISC_R_SUCCESS);
}
lib/dns/rdata/in_1/svcb_64.c
+1 -1
View File
@@ -1013,7 +1013,7 @@ generic_tostruct_in_svcb(ARGS_TOSTRUCT) {
dns_name_fromregion(&name, &region);
isc_region_consume(&region, name_length(&name));
RETERR(name_duporclone(&name, mctx, &svcb->svcdomain));
name_duporclone(&name, mctx, &svcb->svcdomain);
svcb->svclen = region.length;
svcb->svc = mem_maybedup(mctx, region.base, region.length);
lib/dns/resolver.c
+1 -3
View File
@@ -10708,7 +10708,7 @@ dns_resolver_setlamettl(dns_resolver_t *resolver, uint32_t lame_ttl) {
resolver->lame_ttl = lame_ttl;
}
isc_result_t
void
dns_resolver_addalternate(dns_resolver_t *resolver, const isc_sockaddr_t *alt,
const dns_name_t *name, in_port_t port) {
alternate_t *a;
@@ -10729,8 +10729,6 @@ dns_resolver_addalternate(dns_resolver_t *resolver, const isc_sockaddr_t *alt,
}
ISC_LINK_INIT(a, link);
ISC_LIST_APPEND(resolver->alternates, a, link);
return (ISC_R_SUCCESS);
}
void
lib/dns/ssu.c
+4 -12
View File
@@ -57,7 +57,7 @@ struct dns_ssutable {
ISC_LIST(dns_ssurule_t) rules;
};
isc_result_t
void
dns_ssutable_create(isc_mem_t *mctx, dns_ssutable_t **tablep) {
dns_ssutable_t *table;
@@ -71,7 +71,6 @@ dns_ssutable_create(isc_mem_t *mctx, dns_ssutable_t **tablep) {
ISC_LIST_INIT(table->rules);
table->magic = SSUTABLEMAGIC;
*tablep = table;
return (ISC_R_SUCCESS);
}
static inline void
@@ -129,7 +128,7 @@ dns_ssutable_detach(dns_ssutable_t **tablep) {
}
}
isc_result_t
void
dns_ssutable_addrule(dns_ssutable_t *table, bool grant,
const dns_name_t *identity, dns_ssumatchtype_t matchtype,
const dns_name_t *name, unsigned int ntypes,
@@ -177,8 +176,6 @@ dns_ssutable_addrule(dns_ssutable_t *table, bool grant,
rule->magic = SSURULEMAGIC;
ISC_LIST_INITANDAPPEND(table->rules, rule, link);
return (ISC_R_SUCCESS);
}
static inline bool
@@ -599,19 +596,15 @@ dns_ssutable_nextrule(dns_ssurule_t *rule, dns_ssurule_t **nextrule) {
/*
* Create a specialised SSU table that points at an external DLZ database
*/
isc_result_t
void
dns_ssutable_createdlz(isc_mem_t *mctx, dns_ssutable_t **tablep,
dns_dlzdb_t *dlzdatabase) {
isc_result_t result;
dns_ssurule_t *rule;
dns_ssutable_t *table = NULL;
REQUIRE(tablep != NULL && *tablep == NULL);
result = dns_ssutable_create(mctx, &table);
if (result != ISC_R_SUCCESS) {
return (result);
}
dns_ssutable_create(mctx, &table);
table->dlzdatabase = dlzdatabase;
@@ -627,7 +620,6 @@ dns_ssutable_createdlz(isc_mem_t *mctx, dns_ssutable_t **tablep,
ISC_LIST_INITANDAPPEND(table->rules, rule, link);
*tablep = table;
return (ISC_R_SUCCESS);
}
isc_result_t
lib/dns/view.c
+4 -6
View File
@@ -1739,7 +1739,7 @@ dns_view_flushnode(dns_view_t *view, const dns_name_t *name, bool tree) {
return (result);
}
isc_result_t
void
dns_view_adddelegationonly(dns_view_t *view, const dns_name_t *name) {
dns_name_t *item;
unsigned int hash;
@@ -1760,16 +1760,15 @@ dns_view_adddelegationonly(dns_view_t *view, const dns_name_t *name) {
item = ISC_LIST_NEXT(item, link);
}
if (item != NULL) {
return (ISC_R_SUCCESS);
return;
}
item = isc_mem_get(view->mctx, sizeof(*item));
dns_name_init(item, NULL);
dns_name_dup(name, view->mctx, item);
ISC_LIST_APPEND(view->delonly[hash], item, link);
return (ISC_R_SUCCESS);
}
isc_result_t
void
dns_view_excludedelegationonly(dns_view_t *view, const dns_name_t *name) {
dns_name_t *item;
unsigned int hash;
@@ -1790,13 +1789,12 @@ dns_view_excludedelegationonly(dns_view_t *view, const dns_name_t *name) {
item = ISC_LIST_NEXT(item, link);
}
if (item != NULL) {
return (ISC_R_SUCCESS);
return;
}
item = isc_mem_get(view->mctx, sizeof(*item));
dns_name_init(item, NULL);
dns_name_dup(name, view->mctx, item);
ISC_LIST_APPEND(view->rootexclude[hash], item, link);
return (ISC_R_SUCCESS);
}
bool
lib/dns/zone.c
+13 -32
View File
@@ -1342,12 +1342,9 @@ zone_free(dns_zone_t *zone) {
dns_catz_catzs_detach(&zone->catzs);
}
zone_freedbargs(zone);
RUNTIME_CHECK(dns_zone_setparentals(zone, NULL, NULL, NULL, 0) ==
ISC_R_SUCCESS);
RUNTIME_CHECK(dns_zone_setprimaries(zone, NULL, NULL, NULL, 0) ==
ISC_R_SUCCESS);
RUNTIME_CHECK(dns_zone_setalsonotify(zone, NULL, NULL, NULL, NULL, 0) ==
ISC_R_SUCCESS);
dns_zone_setparentals(zone, NULL, NULL, NULL, 0);
dns_zone_setprimaries(zone, NULL, NULL, NULL, 0);
dns_zone_setalsonotify(zone, NULL, NULL, NULL, NULL, 0);
zone->check_names = dns_severity_ignore;
if (zone->update_acl != NULL) {
dns_acl_detach(&zone->update_acl);
@@ -6252,7 +6249,7 @@ clear_serverslist(isc_sockaddr_t **addrsp, isc_dscp_t **dscpsp,
}
}
static isc_result_t
static void
set_serverslist(unsigned int count, const isc_sockaddr_t *addrs,
isc_sockaddr_t **newaddrsp, const isc_dscp_t *dscp,
isc_dscp_t **newdscpp, dns_name_t **keynames,
@@ -6313,14 +6310,12 @@ set_serverslist(unsigned int count, const isc_sockaddr_t *addrs,
*newaddrsp = newaddrs;
*newkeynamesp = newkeynames;
*newtlsnamesp = newtlsnames;
return (ISC_R_SUCCESS);
}
isc_result_t
void
dns_zone_setalsonotify(dns_zone_t *zone, const isc_sockaddr_t *notify,
const isc_dscp_t *dscps, dns_name_t **keynames,
dns_name_t **tlsnames, uint32_t count) {
isc_result_t result;
isc_sockaddr_t *newaddrs = NULL;
isc_dscp_t *newdscps = NULL;
dns_name_t **newkeynames = NULL;
@@ -6353,12 +6348,8 @@ dns_zone_setalsonotify(dns_zone_t *zone, const isc_sockaddr_t *notify,
/*
* Set up the notify and notifykey lists
*/
result = set_serverslist(count, notify, &newaddrs, dscps, &newdscps,
keynames, &newkeynames, tlsnames, &newtlsnames,
zone->mctx);
if (result != ISC_R_SUCCESS) {
goto unlock;
}
set_serverslist(count, notify, &newaddrs, dscps, &newdscps, keynames,
&newkeynames, tlsnames, &newtlsnames, zone->mctx);
/*
* Everything is ok so attach to the zone.
@@ -6370,14 +6361,12 @@ dns_zone_setalsonotify(dns_zone_t *zone, const isc_sockaddr_t *notify,
zone->notifycnt = count;
unlock:
UNLOCK_ZONE(zone);
return (ISC_R_SUCCESS);
}
isc_result_t
void
dns_zone_setprimaries(dns_zone_t *zone, const isc_sockaddr_t *primaries,
dns_name_t **keynames, dns_name_t **tlsnames,
uint32_t count) {
isc_result_t result = ISC_R_SUCCESS;
isc_sockaddr_t *newaddrs = NULL;
isc_dscp_t *newdscps = NULL;
dns_name_t **newkeynames = NULL;
@@ -6441,14 +6430,9 @@ dns_zone_setprimaries(dns_zone_t *zone, const isc_sockaddr_t *primaries,
/*
* Now set up the primaries and primary key lists
*/
result = set_serverslist(count, primaries, &newaddrs, NULL, &newdscps,
keynames, &newkeynames, tlsnames, &newtlsnames,
zone->mctx);
set_serverslist(count, primaries, &newaddrs, NULL, &newdscps, keynames,
&newkeynames, tlsnames, &newtlsnames, zone->mctx);
INSIST(newdscps == NULL);
if (result != ISC_R_SUCCESS) {
isc_mem_put(zone->mctx, newok, count * sizeof(*newok));
goto unlock;
}
/*
* Everything is ok so attach to the zone.
@@ -6464,10 +6448,9 @@ dns_zone_setprimaries(dns_zone_t *zone, const isc_sockaddr_t *primaries,
unlock:
UNLOCK_ZONE(zone);
return (result);
}
isc_result_t
void
dns_zone_setparentals(dns_zone_t *zone, const isc_sockaddr_t *parentals,
dns_name_t **keynames, dns_name_t **tlsnames,
uint32_t count) {
@@ -6499,9 +6482,8 @@ dns_zone_setparentals(dns_zone_t *zone, const isc_sockaddr_t *parentals,
/*
* Now set up the parentals and parental key lists
*/
result = set_serverslist(count, parentals, &newaddrs, NULL, &newdscps,
keynames, &newkeynames, tlsnames, &newtlsnames,
zone->mctx);
set_serverslist(count, parentals, &newaddrs, NULL, &newdscps, keynames,
&newkeynames, tlsnames, &newtlsnames, zone->mctx);
INSIST(newdscps == NULL);
if (result != ISC_R_SUCCESS) {
goto unlock;
@@ -6520,7 +6502,6 @@ dns_zone_setparentals(dns_zone_t *zone, const isc_sockaddr_t *parentals,
unlock:
UNLOCK_ZONE(zone);
return (result);
}
isc_result_t