mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 06:55:30 +00:00
Code Issues Releases Wiki Activity

Merge branch '372-smimea-and-tlsa-methods-incorrectly-use-txt-type' into 'master'

Browse Source 
Resolve "smimea and tlsa methods incorrectly use txt type"

Closes #372

See merge request isc-projects/bind9!458
This commit is contained in:
Mark Andrews
2018-08-01 18:23:53 -04:00
parent d9929b1b0a 63c9ec367f
commit 1a5620db01
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/dns/rdata/generic/smimea_53.c
View File

@@ -79,24 +79,24 @@ fromstruct_smimea(ARGS_FROMSTRUCT) {
static inline isc_result_t static inline isc_result_t
tostruct_smimea(ARGS_TOSTRUCT) { tostruct_smimea(ARGS_TOSTRUCT) {
dns_rdata_txt_t *txt = target; dns_rdata_smimea_t *smimea = target;
REQUIRE(rdata->type == dns_rdatatype_smimea); REQUIRE(rdata->type == dns_rdatatype_smimea);
REQUIRE(target != NULL); REQUIRE(target != NULL);
txt->common.rdclass = rdata->rdclass; smimea->common.rdclass = rdata->rdclass;
txt->common.rdtype = rdata->type; smimea->common.rdtype = rdata->type;
ISC_LINK_INIT(&txt->common, link); ISC_LINK_INIT(&smimea->common, link);
return (generic_tostruct_tlsa(rdata, target, mctx)); return (generic_tostruct_tlsa(rdata, target, mctx));
} }
static inline void static inline void
freestruct_smimea(ARGS_FREESTRUCT) { freestruct_smimea(ARGS_FREESTRUCT) {
dns_rdata_txt_t *txt = source; dns_rdata_smimea_t *smimea = source;
REQUIRE(source != NULL); REQUIRE(source != NULL);
REQUIRE(txt->common.rdtype == dns_rdatatype_smimea); REQUIRE(smimea->common.rdtype == dns_rdatatype_smimea);
generic_freestruct_tlsa(source); generic_freestruct_tlsa(source);
} }

12
lib/dns/rdata/generic/tlsa_52.c
View File

@@ -257,24 +257,24 @@ fromstruct_tlsa(ARGS_FROMSTRUCT) {
static inline isc_result_t static inline isc_result_t
tostruct_tlsa(ARGS_TOSTRUCT) { tostruct_tlsa(ARGS_TOSTRUCT) {
dns_rdata_txt_t *txt = target; dns_rdata_tlsa_t *tlsa = target;
REQUIRE(rdata->type == dns_rdatatype_tlsa); REQUIRE(rdata->type == dns_rdatatype_tlsa);
REQUIRE(target != NULL); REQUIRE(target != NULL);
txt->common.rdclass = rdata->rdclass; tlsa->common.rdclass = rdata->rdclass;
txt->common.rdtype = rdata->type; tlsa->common.rdtype = rdata->type;
ISC_LINK_INIT(&txt->common, link); ISC_LINK_INIT(&tlsa->common, link);
return (generic_tostruct_tlsa(rdata, target, mctx)); return (generic_tostruct_tlsa(rdata, target, mctx));
} }
static inline void static inline void
freestruct_tlsa(ARGS_FREESTRUCT) { freestruct_tlsa(ARGS_FREESTRUCT) {
dns_rdata_txt_t *txt = source; dns_rdata_tlsa_t *tlsa = source;
REQUIRE(source != NULL); REQUIRE(source != NULL);
REQUIRE(txt->common.rdtype == dns_rdatatype_tlsa); REQUIRE(tlsa->common.rdtype == dns_rdatatype_tlsa);
generic_freestruct_tlsa(source); generic_freestruct_tlsa(source);
} }