From 50ab648f8aa3f4a8de87bee68bcd3e79f91053b0 Mon Sep 17 00:00:00 2001 From: Tony Finch Date: Wed, 9 Nov 2022 17:10:59 +0000 Subject: [PATCH] Remove unused support for fromwire(DNS_NAME_DOWNCASE) Most of this change is fixing dns_rdata_fromwire() so it does not propagate the unused options variable. --- CHANGES | 5 +++++ bin/tools/dnstap-read.c | 2 +- fuzz/dns_name_fromwire.c | 2 +- fuzz/dns_rdata_fromwire_text.c | 2 +- lib/dns/client.c | 2 +- lib/dns/gen.c | 2 +- lib/dns/include/dns/name.h | 2 +- lib/dns/include/dns/rdata.h | 7 +------ lib/dns/journal.c | 4 ++-- lib/dns/master.c | 4 ++-- lib/dns/message.c | 4 ++-- lib/dns/name.c | 4 +--- lib/dns/nsec3.c | 2 +- lib/dns/rdata.c | 12 +++++------- lib/dns/rdata/any_255/tsig_250.c | 2 +- lib/dns/rdata/ch_3/a_1.c | 2 +- lib/dns/rdata/generic/afsdb_18.c | 2 +- lib/dns/rdata/generic/amtrelay_260.c | 3 +-- lib/dns/rdata/generic/caa_257.c | 1 - lib/dns/rdata/generic/cert_37.c | 1 - lib/dns/rdata/generic/cname_5.c | 2 +- lib/dns/rdata/generic/csync_62.c | 1 - lib/dns/rdata/generic/dname_39.c | 2 +- lib/dns/rdata/generic/doa_259.c | 1 - lib/dns/rdata/generic/ds_43.c | 1 - lib/dns/rdata/generic/eui48_108.c | 1 - lib/dns/rdata/generic/eui64_109.c | 1 - lib/dns/rdata/generic/gpos_27.c | 1 - lib/dns/rdata/generic/hinfo_13.c | 1 - lib/dns/rdata/generic/hip_55.c | 2 +- lib/dns/rdata/generic/ipseckey_45.c | 2 +- lib/dns/rdata/generic/isdn_20.c | 1 - lib/dns/rdata/generic/key_25.c | 1 - lib/dns/rdata/generic/keydata_65533.c | 1 - lib/dns/rdata/generic/l32_105.c | 1 - lib/dns/rdata/generic/l64_106.c | 1 - lib/dns/rdata/generic/loc_29.c | 1 - lib/dns/rdata/generic/lp_107.c | 2 +- lib/dns/rdata/generic/mb_7.c | 2 +- lib/dns/rdata/generic/md_3.c | 2 +- lib/dns/rdata/generic/mf_4.c | 2 +- lib/dns/rdata/generic/mg_8.c | 2 +- lib/dns/rdata/generic/minfo_14.c | 4 ++-- lib/dns/rdata/generic/mr_9.c | 2 +- lib/dns/rdata/generic/mx_15.c | 2 +- lib/dns/rdata/generic/naptr_35.c | 2 +- lib/dns/rdata/generic/nid_104.c | 1 - lib/dns/rdata/generic/ns_2.c | 2 +- lib/dns/rdata/generic/nsec3_50.c | 1 - lib/dns/rdata/generic/nsec3param_51.c | 1 - lib/dns/rdata/generic/nsec_47.c | 2 +- lib/dns/rdata/generic/null_10.c | 1 - lib/dns/rdata/generic/nxt_30.c | 2 +- lib/dns/rdata/generic/openpgpkey_61.c | 1 - lib/dns/rdata/generic/opt_41.c | 1 - lib/dns/rdata/generic/ptr_12.c | 2 +- lib/dns/rdata/generic/rp_17.c | 4 ++-- lib/dns/rdata/generic/rrsig_46.c | 2 +- lib/dns/rdata/generic/rt_21.c | 2 +- lib/dns/rdata/generic/sig_24.c | 2 +- lib/dns/rdata/generic/sink_40.c | 1 - lib/dns/rdata/generic/soa_6.c | 4 ++-- lib/dns/rdata/generic/sshfp_44.c | 1 - lib/dns/rdata/generic/talink_58.c | 4 ++-- lib/dns/rdata/generic/tkey_249.c | 2 +- lib/dns/rdata/generic/tlsa_52.c | 1 - lib/dns/rdata/generic/txt_16.c | 1 - lib/dns/rdata/generic/uri_256.c | 1 - lib/dns/rdata/generic/x25_19.c | 1 - lib/dns/rdata/generic/zonemd_63.c | 1 - lib/dns/rdata/hs_4/a_1.c | 1 - lib/dns/rdata/in_1/a6_38.c | 2 +- lib/dns/rdata/in_1/a_1.c | 1 - lib/dns/rdata/in_1/aaaa_28.c | 1 - lib/dns/rdata/in_1/apl_42.c | 3 +-- lib/dns/rdata/in_1/atma_34.c | 1 - lib/dns/rdata/in_1/dhcid_49.c | 1 - lib/dns/rdata/in_1/eid_31.c | 1 - lib/dns/rdata/in_1/kx_36.c | 2 +- lib/dns/rdata/in_1/nimloc_32.c | 1 - lib/dns/rdata/in_1/nsap-ptr_23.c | 2 +- lib/dns/rdata/in_1/nsap_22.c | 1 - lib/dns/rdata/in_1/px_26.c | 4 ++-- lib/dns/rdata/in_1/srv_33.c | 2 +- lib/dns/rdata/in_1/svcb_64.c | 2 +- lib/dns/rdata/in_1/wks_11.c | 1 - tests/bench/dns_name_fromwire.c | 2 +- tests/dns/name_test.c | 10 +++++----- tests/dns/rdata_test.c | 2 +- 89 files changed, 72 insertions(+), 115 deletions(-) diff --git a/CHANGES b/CHANGES index b8ec767995..0c599bcc88 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,8 @@ +6087. [cleanup] Remove support for the `DNS_NAME_DOWNCASE` option to + the various dns_*_fromwire() functions. It has long + been unused and is unsupported since change 6022. + [GL !7467] + 6086. [cleanup] Remove some remnants of bitstring labels. [GL !7196] 6085. [func] Add isc_time_monotonic() to simplify time measurements. diff --git a/bin/tools/dnstap-read.c b/bin/tools/dnstap-read.c index ee4aae12f5..2e06608101 100644 --- a/bin/tools/dnstap-read.c +++ b/bin/tools/dnstap-read.c @@ -297,7 +297,7 @@ print_yaml(dns_dtdata_t *dt) { isc_buffer_init(&b, m->query_zone.data, m->query_zone.len); isc_buffer_add(&b, m->query_zone.len); - result = dns_name_fromwire(name, &b, DNS_DECOMPRESS_NEVER, 0, + result = dns_name_fromwire(name, &b, DNS_DECOMPRESS_NEVER, NULL); if (result == ISC_R_SUCCESS) { printf(" query_zone: "); diff --git a/fuzz/dns_name_fromwire.c b/fuzz/dns_name_fromwire.c index ec9e0d2590..6fd02a51e7 100644 --- a/fuzz/dns_name_fromwire.c +++ b/fuzz/dns_name_fromwire.c @@ -72,7 +72,7 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { isc_buffer_add(&new_buf, size); isc_buffer_setactive(&new_buf, size); isc_buffer_forward(&new_buf, size / 2); - new_result = dns_name_fromwire(new_name, &new_buf, dctx, 0, NULL); + new_result = dns_name_fromwire(new_name, &new_buf, dctx, NULL); isc_buffer_constinit(&old_buf, data, size); isc_buffer_add(&old_buf, size); diff --git a/fuzz/dns_rdata_fromwire_text.c b/fuzz/dns_rdata_fromwire_text.c index 67f3ce3830..dee7d00282 100644 --- a/fuzz/dns_rdata_fromwire_text.c +++ b/fuzz/dns_rdata_fromwire_text.c @@ -145,7 +145,7 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { * reading a packet) */ CHECK(dns_rdata_fromwire(&rdata1, rdclass, rdtype, &source, - DNS_DECOMPRESS_NEVER, 0, &target)); + DNS_DECOMPRESS_NEVER, &target)); assert(rdata1.length == size); /* diff --git a/lib/dns/client.c b/lib/dns/client.c index 5e76b684a1..74a88882d6 100644 --- a/lib/dns/client.c +++ b/lib/dns/client.c @@ -1134,7 +1134,7 @@ dns_client_addtrustedkey(dns_client_t *client, dns_rdataclass_t rdclass, dns_rdata_init(&rdata); isc_buffer_setactive(databuf, isc_buffer_usedlength(databuf)); CHECK(dns_rdata_fromwire(&rdata, rdclass, rdtype, databuf, - DNS_DECOMPRESS_NEVER, 0, &b)); + DNS_DECOMPRESS_NEVER, &b)); if (rdtype == dns_rdatatype_ds) { CHECK(dns_rdata_tostruct(&rdata, &ds, NULL)); diff --git a/lib/dns/gen.c b/lib/dns/gen.c index 2e27fc53f4..7f690ce9ab 100644 --- a/lib/dns/gen.c +++ b/lib/dns/gen.c @@ -51,7 +51,7 @@ #define TOTEXTTYPE "rdata->type" #define TOTEXTDEF "use_default = true" -#define FROMWIREARGS "rdclass, type, source, dctx, options, target" +#define FROMWIREARGS "rdclass, type, source, dctx, target" #define FROMWIRECLASS "rdclass" #define FROMWIRETYPE "type" #define FROMWIREDEF "use_default = true" diff --git a/lib/dns/include/dns/name.h b/lib/dns/include/dns/name.h index 423f6fea09..9123910443 100644 --- a/lib/dns/include/dns/name.h +++ b/lib/dns/include/dns/name.h @@ -681,7 +681,7 @@ dns_name_toregion(const dns_name_t *name, isc_region_t *r); isc_result_t dns_name_fromwire(dns_name_t *name, isc_buffer_t *source, dns_decompress_t dctx, - unsigned int options, isc_buffer_t *target); + isc_buffer_t *target); /*%< * Copy the possibly-compressed name at source (active region) into target, * decompressing it. diff --git a/lib/dns/include/dns/rdata.h b/lib/dns/include/dns/rdata.h index 7bf080326e..338af3a3a0 100644 --- a/lib/dns/include/dns/rdata.h +++ b/lib/dns/include/dns/rdata.h @@ -281,18 +281,13 @@ dns_rdata_toregion(const dns_rdata_t *rdata, isc_region_t *r); isc_result_t dns_rdata_fromwire(dns_rdata_t *rdata, dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, - dns_decompress_t dctx, unsigned int options, - isc_buffer_t *target); + dns_decompress_t dctx, isc_buffer_t *target); /*%< * Copy the possibly-compressed rdata at source into the target region. * * Notes: *\li Name decompression policy is controlled by 'dctx'. * - * 'options' - *\li DNS_RDATA_DOWNCASE downcase domain names when they are copied - * into target. - * * Requires: * *\li 'rdclass' and 'type' are valid. diff --git a/lib/dns/journal.c b/lib/dns/journal.c index fa3fdadb44..62038a01b2 100644 --- a/lib/dns/journal.c +++ b/lib/dns/journal.c @@ -2034,7 +2034,7 @@ read_one_rr(dns_journal_t *j) { */ isc_buffer_setactive(&j->it.source, j->it.source.used - j->it.source.current); - CHECK(dns_name_fromwire(&j->it.name, &j->it.source, j->it.dctx, 0, + CHECK(dns_name_fromwire(&j->it.name, &j->it.source, j->it.dctx, &j->it.target)); /* @@ -2066,7 +2066,7 @@ read_one_rr(dns_journal_t *j) { isc_buffer_setactive(&j->it.source, rdlen); dns_rdata_reset(&j->it.rdata); CHECK(dns_rdata_fromwire(&j->it.rdata, rdclass, rdtype, &j->it.source, - j->it.dctx, 0, &j->it.target)); + j->it.dctx, &j->it.target)); j->it.ttl = ttl; j->it.xpos += sizeof(journal_rawrrhdr_t) + rrhdr.size; diff --git a/lib/dns/master.c b/lib/dns/master.c index 23d55d2800..8f15b554b7 100644 --- a/lib/dns/master.c +++ b/lib/dns/master.c @@ -2469,7 +2469,7 @@ load_raw(dns_loadctx_t *lctx) { } isc_buffer_setactive(&target, (unsigned int)namelen); - result = dns_name_fromwire(name, &target, dctx, 0, NULL); + result = dns_name_fromwire(name, &target, dctx, NULL); if (result != ISC_R_SUCCESS) { goto cleanup; } @@ -2560,7 +2560,7 @@ load_raw(dns_loadctx_t *lctx) { (unsigned int)rdlen); result = dns_rdata_fromwire( &rdata[i], rdatalist.rdclass, rdatalist.type, - &target, dctx, 0, &buf); + &target, dctx, &buf); if (result != ISC_R_SUCCESS) { goto cleanup; } diff --git a/lib/dns/message.c b/lib/dns/message.c index d2be3c227c..ef520169fd 100644 --- a/lib/dns/message.c +++ b/lib/dns/message.c @@ -877,7 +877,7 @@ getname(dns_name_t *name, isc_buffer_t *source, dns_message_t *msg, */ tries = 0; while (tries < 2) { - result = dns_name_fromwire(name, source, dctx, 0, scratch); + result = dns_name_fromwire(name, source, dctx, scratch); if (result == ISC_R_NOSPACE) { tries++; @@ -922,7 +922,7 @@ getrdata(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t dctx, /* XXX possibly change this to a while (tries < 2) loop */ for (;;) { result = dns_rdata_fromwire(rdata, rdclass, rdtype, source, - dctx, 0, scratch); + dctx, scratch); if (result == ISC_R_NOSPACE) { if (tries == 0) { diff --git a/lib/dns/name.c b/lib/dns/name.c index 0712191cb5..7014e6c6ac 100644 --- a/lib/dns/name.c +++ b/lib/dns/name.c @@ -1521,8 +1521,7 @@ set_offsets(const dns_name_t *name, unsigned char *offsets, isc_result_t dns_name_fromwire(dns_name_t *const name, isc_buffer_t *const source, - const dns_decompress_t dctx, unsigned int options, - isc_buffer_t *target) { + const dns_decompress_t dctx, isc_buffer_t *target) { /* * Copy the name at source into target, decompressing it. * @@ -1574,7 +1573,6 @@ dns_name_fromwire(dns_name_t *const name, isc_buffer_t *const source, * correct way to set our "consumed" variable. */ - REQUIRE((options & DNS_NAME_DOWNCASE) == 0); REQUIRE(VALID_NAME(name)); REQUIRE(BINDABLE(name)); REQUIRE((target != NULL && ISC_BUFFER_VALID(target)) || diff --git a/lib/dns/nsec3.c b/lib/dns/nsec3.c index a25e5e3941..b0688139f5 100644 --- a/lib/dns/nsec3.c +++ b/lib/dns/nsec3.c @@ -992,7 +992,7 @@ dns_nsec3param_fromprivate(dns_rdata_t *src, dns_rdata_t *target, isc_buffer_init(&buf2, buf, (unsigned int)buflen); result = dns_rdata_fromwire(target, src->rdclass, dns_rdatatype_nsec3param, &buf1, - DNS_DECOMPRESS_NEVER, 0, &buf2); + DNS_DECOMPRESS_NEVER, &buf2); return (result == ISC_R_SUCCESS); } diff --git a/lib/dns/rdata.c b/lib/dns/rdata.c index f7f9a9deb5..68dcbcbfd3 100644 --- a/lib/dns/rdata.c +++ b/lib/dns/rdata.c @@ -98,10 +98,9 @@ #define ARGS_FROMWIRE \ int rdclass, dns_rdatatype_t type, isc_buffer_t *source, \ - dns_decompress_t dctx, unsigned int options, \ - isc_buffer_t *target + dns_decompress_t dctx, isc_buffer_t *target -#define CALL_FROMWIRE rdclass, type, source, dctx, options, target +#define CALL_FROMWIRE rdclass, type, source, dctx, target #define ARGS_TOWIRE \ dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target @@ -604,7 +603,7 @@ check_private(isc_buffer_t *source, dns_secalg_t alg) { dns_fixedname_t fixed; RETERR(dns_name_fromwire(dns_fixedname_initname(&fixed), source, - DNS_DECOMPRESS_DEFAULT, 0, NULL)); + DNS_DECOMPRESS_DEFAULT, NULL)); /* * There should be a public key or signature after the key name. */ @@ -795,8 +794,7 @@ dns_rdata_toregion(const dns_rdata_t *rdata, isc_region_t *r) { isc_result_t dns_rdata_fromwire(dns_rdata_t *rdata, dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, - dns_decompress_t dctx, unsigned int options, - isc_buffer_t *target) { + dns_decompress_t dctx, isc_buffer_t *target) { isc_result_t result = ISC_R_NOTIMPLEMENTED; isc_region_t region; isc_buffer_t ss; @@ -915,7 +913,7 @@ rdata_validate(isc_buffer_t *src, isc_buffer_t *dest, dns_rdataclass_t rdclass, isc_buffer_setactive(src, isc_buffer_usedlength(src)); result = dns_rdata_fromwire(NULL, rdclass, type, src, - DNS_DECOMPRESS_NEVER, 0, dest); + DNS_DECOMPRESS_NEVER, dest); return (result); } diff --git a/lib/dns/rdata/any_255/tsig_250.c b/lib/dns/rdata/any_255/tsig_250.c index de04280456..b75f3c81ae 100644 --- a/lib/dns/rdata/any_255/tsig_250.c +++ b/lib/dns/rdata/any_255/tsig_250.c @@ -270,7 +270,7 @@ fromwire_any_tsig(ARGS_FROMWIRE) { * Algorithm Name. */ dns_name_init(&name, NULL); - RETERR(dns_name_fromwire(&name, source, dctx, options, target)); + RETERR(dns_name_fromwire(&name, source, dctx, target)); isc_buffer_activeregion(source, &sr); /* diff --git a/lib/dns/rdata/ch_3/a_1.c b/lib/dns/rdata/ch_3/a_1.c index 09051af0cc..55c0adb0bb 100644 --- a/lib/dns/rdata/ch_3/a_1.c +++ b/lib/dns/rdata/ch_3/a_1.c @@ -109,7 +109,7 @@ fromwire_ch_a(ARGS_FROMWIRE) { dns_name_init(&name, NULL); - RETERR(dns_name_fromwire(&name, source, dctx, options, target)); + RETERR(dns_name_fromwire(&name, source, dctx, target)); isc_buffer_activeregion(source, &sregion); isc_buffer_availableregion(target, &tregion); diff --git a/lib/dns/rdata/generic/afsdb_18.c b/lib/dns/rdata/generic/afsdb_18.c index 3b24048479..a2362f3b70 100644 --- a/lib/dns/rdata/generic/afsdb_18.c +++ b/lib/dns/rdata/generic/afsdb_18.c @@ -116,7 +116,7 @@ fromwire_afsdb(ARGS_FROMWIRE) { memmove(tr.base, sr.base, 2); isc_buffer_forward(source, 2); isc_buffer_add(target, 2); - return (dns_name_fromwire(&name, source, dctx, options, target)); + return (dns_name_fromwire(&name, source, dctx, target)); } static isc_result_t diff --git a/lib/dns/rdata/generic/amtrelay_260.c b/lib/dns/rdata/generic/amtrelay_260.c index b2a45a851d..6d8ac21456 100644 --- a/lib/dns/rdata/generic/amtrelay_260.c +++ b/lib/dns/rdata/generic/amtrelay_260.c @@ -225,8 +225,7 @@ fromwire_amtrelay(ARGS_FROMWIRE) { RETERR(mem_tobuffer(target, region.base, 2)); isc_buffer_forward(source, 2); dns_name_init(&name, NULL); - return (dns_name_fromwire(&name, source, dctx, options, - target)); + return (dns_name_fromwire(&name, source, dctx, target)); default: isc_buffer_forward(source, region.length); diff --git a/lib/dns/rdata/generic/caa_257.c b/lib/dns/rdata/generic/caa_257.c index b6845f74a5..a6eee8e574 100644 --- a/lib/dns/rdata/generic/caa_257.c +++ b/lib/dns/rdata/generic/caa_257.c @@ -371,7 +371,6 @@ fromwire_caa(ARGS_FROMWIRE) { UNUSED(type); UNUSED(rdclass); UNUSED(dctx); - UNUSED(options); /* * Flags diff --git a/lib/dns/rdata/generic/cert_37.c b/lib/dns/rdata/generic/cert_37.c index 846027e804..92d62dbb1c 100644 --- a/lib/dns/rdata/generic/cert_37.c +++ b/lib/dns/rdata/generic/cert_37.c @@ -124,7 +124,6 @@ fromwire_cert(ARGS_FROMWIRE) { UNUSED(type); UNUSED(rdclass); UNUSED(dctx); - UNUSED(options); isc_buffer_activeregion(source, &sr); if (sr.length < 6) { diff --git a/lib/dns/rdata/generic/cname_5.c b/lib/dns/rdata/generic/cname_5.c index 3cc6918c52..754aef9060 100644 --- a/lib/dns/rdata/generic/cname_5.c +++ b/lib/dns/rdata/generic/cname_5.c @@ -74,7 +74,7 @@ fromwire_cname(ARGS_FROMWIRE) { dctx = dns_decompress_setpermitted(dctx, true); dns_name_init(&name, NULL); - return (dns_name_fromwire(&name, source, dctx, options, target)); + return (dns_name_fromwire(&name, source, dctx, target)); } static isc_result_t diff --git a/lib/dns/rdata/generic/csync_62.c b/lib/dns/rdata/generic/csync_62.c index aabc0fa5c6..311ba00cea 100644 --- a/lib/dns/rdata/generic/csync_62.c +++ b/lib/dns/rdata/generic/csync_62.c @@ -89,7 +89,6 @@ fromwire_csync(ARGS_FROMWIRE) { UNUSED(type); UNUSED(rdclass); - UNUSED(options); UNUSED(dctx); /* diff --git a/lib/dns/rdata/generic/dname_39.c b/lib/dns/rdata/generic/dname_39.c index b061ccb13a..d1d1f52083 100644 --- a/lib/dns/rdata/generic/dname_39.c +++ b/lib/dns/rdata/generic/dname_39.c @@ -75,7 +75,7 @@ fromwire_dname(ARGS_FROMWIRE) { dctx = dns_decompress_setpermitted(dctx, false); dns_name_init(&name, NULL); - return (dns_name_fromwire(&name, source, dctx, options, target)); + return (dns_name_fromwire(&name, source, dctx, target)); } static isc_result_t diff --git a/lib/dns/rdata/generic/doa_259.c b/lib/dns/rdata/generic/doa_259.c index ad53507a03..442149d29a 100644 --- a/lib/dns/rdata/generic/doa_259.c +++ b/lib/dns/rdata/generic/doa_259.c @@ -131,7 +131,6 @@ fromwire_doa(ARGS_FROMWIRE) { UNUSED(rdclass); UNUSED(dctx); - UNUSED(options); REQUIRE(type == dns_rdatatype_doa); diff --git a/lib/dns/rdata/generic/ds_43.c b/lib/dns/rdata/generic/ds_43.c index cbae52d044..2af212333a 100644 --- a/lib/dns/rdata/generic/ds_43.c +++ b/lib/dns/rdata/generic/ds_43.c @@ -163,7 +163,6 @@ generic_fromwire_ds(ARGS_FROMWIRE) { UNUSED(type); UNUSED(rdclass); UNUSED(dctx); - UNUSED(options); isc_buffer_activeregion(source, &sr); diff --git a/lib/dns/rdata/generic/eui48_108.c b/lib/dns/rdata/generic/eui48_108.c index 25603b29e2..8dfdc74c5a 100644 --- a/lib/dns/rdata/generic/eui48_108.c +++ b/lib/dns/rdata/generic/eui48_108.c @@ -74,7 +74,6 @@ fromwire_eui48(ARGS_FROMWIRE) { REQUIRE(type == dns_rdatatype_eui48); UNUSED(type); - UNUSED(options); UNUSED(rdclass); UNUSED(dctx); diff --git a/lib/dns/rdata/generic/eui64_109.c b/lib/dns/rdata/generic/eui64_109.c index 93978d2ed9..2c25319e30 100644 --- a/lib/dns/rdata/generic/eui64_109.c +++ b/lib/dns/rdata/generic/eui64_109.c @@ -77,7 +77,6 @@ fromwire_eui64(ARGS_FROMWIRE) { REQUIRE(type == dns_rdatatype_eui64); UNUSED(type); - UNUSED(options); UNUSED(rdclass); UNUSED(dctx); diff --git a/lib/dns/rdata/generic/gpos_27.c b/lib/dns/rdata/generic/gpos_27.c index 011434db8b..38729801a0 100644 --- a/lib/dns/rdata/generic/gpos_27.c +++ b/lib/dns/rdata/generic/gpos_27.c @@ -70,7 +70,6 @@ fromwire_gpos(ARGS_FROMWIRE) { UNUSED(type); UNUSED(dctx); UNUSED(rdclass); - UNUSED(options); for (i = 0; i < 3; i++) { RETERR(txt_fromwire(source, target)); diff --git a/lib/dns/rdata/generic/hinfo_13.c b/lib/dns/rdata/generic/hinfo_13.c index 0031615bf5..a447019cfc 100644 --- a/lib/dns/rdata/generic/hinfo_13.c +++ b/lib/dns/rdata/generic/hinfo_13.c @@ -58,7 +58,6 @@ fromwire_hinfo(ARGS_FROMWIRE) { UNUSED(type); UNUSED(dctx); UNUSED(rdclass); - UNUSED(options); RETERR(txt_fromwire(source, target)); return (txt_fromwire(source, target)); diff --git a/lib/dns/rdata/generic/hip_55.c b/lib/dns/rdata/generic/hip_55.c index c12d7da1ac..8b347bc258 100644 --- a/lib/dns/rdata/generic/hip_55.c +++ b/lib/dns/rdata/generic/hip_55.c @@ -229,7 +229,7 @@ fromwire_hip(ARGS_FROMWIRE) { dctx = dns_decompress_setpermitted(dctx, false); while (isc_buffer_activelength(source) > 0) { dns_name_init(&name, NULL); - RETERR(dns_name_fromwire(&name, source, dctx, options, target)); + RETERR(dns_name_fromwire(&name, source, dctx, target)); } return (ISC_R_SUCCESS); } diff --git a/lib/dns/rdata/generic/ipseckey_45.c b/lib/dns/rdata/generic/ipseckey_45.c index c69280d79f..73214a9ee6 100644 --- a/lib/dns/rdata/generic/ipseckey_45.c +++ b/lib/dns/rdata/generic/ipseckey_45.c @@ -255,7 +255,7 @@ fromwire_ipseckey(ARGS_FROMWIRE) { case 3: RETERR(mem_tobuffer(target, region.base, 3)); isc_buffer_forward(source, 3); - RETERR(dns_name_fromwire(&name, source, dctx, options, target)); + RETERR(dns_name_fromwire(&name, source, dctx, target)); isc_buffer_activeregion(source, ®ion); isc_buffer_forward(source, region.length); if (region.length < 1) { diff --git a/lib/dns/rdata/generic/isdn_20.c b/lib/dns/rdata/generic/isdn_20.c index 8680613fd7..a118e63bc9 100644 --- a/lib/dns/rdata/generic/isdn_20.c +++ b/lib/dns/rdata/generic/isdn_20.c @@ -73,7 +73,6 @@ fromwire_isdn(ARGS_FROMWIRE) { UNUSED(type); UNUSED(dctx); UNUSED(rdclass); - UNUSED(options); RETERR(txt_fromwire(source, target)); if (buffer_empty(source)) { diff --git a/lib/dns/rdata/generic/key_25.c b/lib/dns/rdata/generic/key_25.c index c8fdfab5f8..d1ab0ad030 100644 --- a/lib/dns/rdata/generic/key_25.c +++ b/lib/dns/rdata/generic/key_25.c @@ -234,7 +234,6 @@ generic_fromwire_key(ARGS_FROMWIRE) { UNUSED(rdclass); UNUSED(dctx); - UNUSED(options); isc_buffer_activeregion(source, &sr); if (sr.length < 4) { diff --git a/lib/dns/rdata/generic/keydata_65533.c b/lib/dns/rdata/generic/keydata_65533.c index 34666b3fac..9e00a77ab7 100644 --- a/lib/dns/rdata/generic/keydata_65533.c +++ b/lib/dns/rdata/generic/keydata_65533.c @@ -258,7 +258,6 @@ fromwire_keydata(ARGS_FROMWIRE) { UNUSED(type); UNUSED(rdclass); UNUSED(dctx); - UNUSED(options); isc_buffer_activeregion(source, &sr); isc_buffer_forward(source, sr.length); diff --git a/lib/dns/rdata/generic/l32_105.c b/lib/dns/rdata/generic/l32_105.c index 7ab65180d0..616a5a3032 100644 --- a/lib/dns/rdata/generic/l32_105.c +++ b/lib/dns/rdata/generic/l32_105.c @@ -85,7 +85,6 @@ fromwire_l32(ARGS_FROMWIRE) { REQUIRE(type == dns_rdatatype_l32); UNUSED(type); - UNUSED(options); UNUSED(rdclass); UNUSED(dctx); diff --git a/lib/dns/rdata/generic/l64_106.c b/lib/dns/rdata/generic/l64_106.c index ee28f2e235..37dace548d 100644 --- a/lib/dns/rdata/generic/l64_106.c +++ b/lib/dns/rdata/generic/l64_106.c @@ -83,7 +83,6 @@ fromwire_l64(ARGS_FROMWIRE) { REQUIRE(type == dns_rdatatype_l64); UNUSED(type); - UNUSED(options); UNUSED(rdclass); UNUSED(dctx); diff --git a/lib/dns/rdata/generic/loc_29.c b/lib/dns/rdata/generic/loc_29.c index c05e14426d..a35a303a1f 100644 --- a/lib/dns/rdata/generic/loc_29.c +++ b/lib/dns/rdata/generic/loc_29.c @@ -566,7 +566,6 @@ fromwire_loc(ARGS_FROMWIRE) { UNUSED(type); UNUSED(rdclass); UNUSED(dctx); - UNUSED(options); isc_buffer_activeregion(source, &sr); if (sr.length < 1) { diff --git a/lib/dns/rdata/generic/lp_107.c b/lib/dns/rdata/generic/lp_107.c index d02e4aa00d..b1889d7119 100644 --- a/lib/dns/rdata/generic/lp_107.c +++ b/lib/dns/rdata/generic/lp_107.c @@ -98,7 +98,7 @@ fromwire_lp(ARGS_FROMWIRE) { } RETERR(mem_tobuffer(target, sregion.base, 2)); isc_buffer_forward(source, 2); - return (dns_name_fromwire(&name, source, dctx, options, target)); + return (dns_name_fromwire(&name, source, dctx, target)); } static isc_result_t diff --git a/lib/dns/rdata/generic/mb_7.c b/lib/dns/rdata/generic/mb_7.c index 64e3ed3236..a44f37ba5f 100644 --- a/lib/dns/rdata/generic/mb_7.c +++ b/lib/dns/rdata/generic/mb_7.c @@ -73,7 +73,7 @@ fromwire_mb(ARGS_FROMWIRE) { dctx = dns_decompress_setpermitted(dctx, true); dns_name_init(&name, NULL); - return (dns_name_fromwire(&name, source, dctx, options, target)); + return (dns_name_fromwire(&name, source, dctx, target)); } static isc_result_t diff --git a/lib/dns/rdata/generic/md_3.c b/lib/dns/rdata/generic/md_3.c index e817ac0338..eca3d18f1f 100644 --- a/lib/dns/rdata/generic/md_3.c +++ b/lib/dns/rdata/generic/md_3.c @@ -73,7 +73,7 @@ fromwire_md(ARGS_FROMWIRE) { dctx = dns_decompress_setpermitted(dctx, true); dns_name_init(&name, NULL); - return (dns_name_fromwire(&name, source, dctx, options, target)); + return (dns_name_fromwire(&name, source, dctx, target)); } static isc_result_t diff --git a/lib/dns/rdata/generic/mf_4.c b/lib/dns/rdata/generic/mf_4.c index e28878f334..d354871f18 100644 --- a/lib/dns/rdata/generic/mf_4.c +++ b/lib/dns/rdata/generic/mf_4.c @@ -73,7 +73,7 @@ fromwire_mf(ARGS_FROMWIRE) { dctx = dns_decompress_setpermitted(dctx, true); dns_name_init(&name, NULL); - return (dns_name_fromwire(&name, source, dctx, options, target)); + return (dns_name_fromwire(&name, source, dctx, target)); } static isc_result_t diff --git a/lib/dns/rdata/generic/mg_8.c b/lib/dns/rdata/generic/mg_8.c index 60c85c3ba8..a4da991294 100644 --- a/lib/dns/rdata/generic/mg_8.c +++ b/lib/dns/rdata/generic/mg_8.c @@ -73,7 +73,7 @@ fromwire_mg(ARGS_FROMWIRE) { dctx = dns_decompress_setpermitted(dctx, true); dns_name_init(&name, NULL); - return (dns_name_fromwire(&name, source, dctx, options, target)); + return (dns_name_fromwire(&name, source, dctx, target)); } static isc_result_t diff --git a/lib/dns/rdata/generic/minfo_14.c b/lib/dns/rdata/generic/minfo_14.c index 3ccf77a099..25671f8a53 100644 --- a/lib/dns/rdata/generic/minfo_14.c +++ b/lib/dns/rdata/generic/minfo_14.c @@ -103,8 +103,8 @@ fromwire_minfo(ARGS_FROMWIRE) { dns_name_init(&rmail, NULL); dns_name_init(&email, NULL); - RETERR(dns_name_fromwire(&rmail, source, dctx, options, target)); - return (dns_name_fromwire(&email, source, dctx, options, target)); + RETERR(dns_name_fromwire(&rmail, source, dctx, target)); + return (dns_name_fromwire(&email, source, dctx, target)); } static isc_result_t diff --git a/lib/dns/rdata/generic/mr_9.c b/lib/dns/rdata/generic/mr_9.c index 5fc77963d4..c88bc6f007 100644 --- a/lib/dns/rdata/generic/mr_9.c +++ b/lib/dns/rdata/generic/mr_9.c @@ -73,7 +73,7 @@ fromwire_mr(ARGS_FROMWIRE) { dctx = dns_decompress_setpermitted(dctx, true); dns_name_init(&name, NULL); - return (dns_name_fromwire(&name, source, dctx, options, target)); + return (dns_name_fromwire(&name, source, dctx, target)); } static isc_result_t diff --git a/lib/dns/rdata/generic/mx_15.c b/lib/dns/rdata/generic/mx_15.c index a914540ccc..e75828a23e 100644 --- a/lib/dns/rdata/generic/mx_15.c +++ b/lib/dns/rdata/generic/mx_15.c @@ -144,7 +144,7 @@ fromwire_mx(ARGS_FROMWIRE) { } RETERR(mem_tobuffer(target, sregion.base, 2)); isc_buffer_forward(source, 2); - return (dns_name_fromwire(&name, source, dctx, options, target)); + return (dns_name_fromwire(&name, source, dctx, target)); } static isc_result_t diff --git a/lib/dns/rdata/generic/naptr_35.c b/lib/dns/rdata/generic/naptr_35.c index 5babd31b93..ae2a4f9595 100644 --- a/lib/dns/rdata/generic/naptr_35.c +++ b/lib/dns/rdata/generic/naptr_35.c @@ -345,7 +345,7 @@ fromwire_naptr(ARGS_FROMWIRE) { /* * Replacement. */ - return (dns_name_fromwire(&name, source, dctx, options, target)); + return (dns_name_fromwire(&name, source, dctx, target)); } static isc_result_t diff --git a/lib/dns/rdata/generic/nid_104.c b/lib/dns/rdata/generic/nid_104.c index 8a958130c2..2ae714aa5d 100644 --- a/lib/dns/rdata/generic/nid_104.c +++ b/lib/dns/rdata/generic/nid_104.c @@ -83,7 +83,6 @@ fromwire_nid(ARGS_FROMWIRE) { REQUIRE(type == dns_rdatatype_nid); UNUSED(type); - UNUSED(options); UNUSED(rdclass); UNUSED(dctx); diff --git a/lib/dns/rdata/generic/ns_2.c b/lib/dns/rdata/generic/ns_2.c index 32b5430656..c7f12b19c1 100644 --- a/lib/dns/rdata/generic/ns_2.c +++ b/lib/dns/rdata/generic/ns_2.c @@ -84,7 +84,7 @@ fromwire_ns(ARGS_FROMWIRE) { dctx = dns_decompress_setpermitted(dctx, true); dns_name_init(&name, NULL); - return (dns_name_fromwire(&name, source, dctx, options, target)); + return (dns_name_fromwire(&name, source, dctx, target)); } static isc_result_t diff --git a/lib/dns/rdata/generic/nsec3_50.c b/lib/dns/rdata/generic/nsec3_50.c index 0b4db4cd38..463cc4d9cd 100644 --- a/lib/dns/rdata/generic/nsec3_50.c +++ b/lib/dns/rdata/generic/nsec3_50.c @@ -190,7 +190,6 @@ fromwire_nsec3(ARGS_FROMWIRE) { UNUSED(type); UNUSED(rdclass); - UNUSED(options); UNUSED(dctx); isc_buffer_activeregion(source, &sr); diff --git a/lib/dns/rdata/generic/nsec3param_51.c b/lib/dns/rdata/generic/nsec3param_51.c index c7e9620b90..3c8682b6e6 100644 --- a/lib/dns/rdata/generic/nsec3param_51.c +++ b/lib/dns/rdata/generic/nsec3param_51.c @@ -149,7 +149,6 @@ fromwire_nsec3param(ARGS_FROMWIRE) { UNUSED(type); UNUSED(rdclass); - UNUSED(options); UNUSED(dctx); isc_buffer_activeregion(source, &sr); diff --git a/lib/dns/rdata/generic/nsec_47.c b/lib/dns/rdata/generic/nsec_47.c index e36ff65552..ef3403473b 100644 --- a/lib/dns/rdata/generic/nsec_47.c +++ b/lib/dns/rdata/generic/nsec_47.c @@ -88,7 +88,7 @@ fromwire_nsec(ARGS_FROMWIRE) { dctx = dns_decompress_setpermitted(dctx, false); dns_name_init(&name, NULL); - RETERR(dns_name_fromwire(&name, source, dctx, options, target)); + RETERR(dns_name_fromwire(&name, source, dctx, target)); isc_buffer_activeregion(source, &sr); RETERR(typemap_test(&sr, false)); diff --git a/lib/dns/rdata/generic/null_10.c b/lib/dns/rdata/generic/null_10.c index b4a4c304ba..522c4aabb9 100644 --- a/lib/dns/rdata/generic/null_10.c +++ b/lib/dns/rdata/generic/null_10.c @@ -47,7 +47,6 @@ fromwire_null(ARGS_FROMWIRE) { UNUSED(type); UNUSED(rdclass); UNUSED(dctx); - UNUSED(options); isc_buffer_activeregion(source, &sr); isc_buffer_forward(source, sr.length); diff --git a/lib/dns/rdata/generic/nxt_30.c b/lib/dns/rdata/generic/nxt_30.c index 7d62c56a74..bdeac7e4d3 100644 --- a/lib/dns/rdata/generic/nxt_30.c +++ b/lib/dns/rdata/generic/nxt_30.c @@ -147,7 +147,7 @@ fromwire_nxt(ARGS_FROMWIRE) { dctx = dns_decompress_setpermitted(dctx, false); dns_name_init(&name, NULL); - RETERR(dns_name_fromwire(&name, source, dctx, options, target)); + RETERR(dns_name_fromwire(&name, source, dctx, target)); isc_buffer_activeregion(source, &sr); if (sr.length > 0 && ((sr.base[0] & 0x80) != 0 || sr.length > 16 || diff --git a/lib/dns/rdata/generic/openpgpkey_61.c b/lib/dns/rdata/generic/openpgpkey_61.c index 2626877461..5c8c3c7359 100644 --- a/lib/dns/rdata/generic/openpgpkey_61.c +++ b/lib/dns/rdata/generic/openpgpkey_61.c @@ -75,7 +75,6 @@ fromwire_openpgpkey(ARGS_FROMWIRE) { UNUSED(type); UNUSED(rdclass); UNUSED(dctx); - UNUSED(options); /* * Keyring. diff --git a/lib/dns/rdata/generic/opt_41.c b/lib/dns/rdata/generic/opt_41.c index a6fb103ba3..ce22cd9502 100644 --- a/lib/dns/rdata/generic/opt_41.c +++ b/lib/dns/rdata/generic/opt_41.c @@ -104,7 +104,6 @@ fromwire_opt(ARGS_FROMWIRE) { UNUSED(type); UNUSED(rdclass); UNUSED(dctx); - UNUSED(options); isc_buffer_activeregion(source, &sregion); if (sregion.length == 0) { diff --git a/lib/dns/rdata/generic/ptr_12.c b/lib/dns/rdata/generic/ptr_12.c index 8acffe797e..8e30909191 100644 --- a/lib/dns/rdata/generic/ptr_12.c +++ b/lib/dns/rdata/generic/ptr_12.c @@ -86,7 +86,7 @@ fromwire_ptr(ARGS_FROMWIRE) { dctx = dns_decompress_setpermitted(dctx, true); dns_name_init(&name, NULL); - return (dns_name_fromwire(&name, source, dctx, options, target)); + return (dns_name_fromwire(&name, source, dctx, target)); } static isc_result_t diff --git a/lib/dns/rdata/generic/rp_17.c b/lib/dns/rdata/generic/rp_17.c index dfba5feca9..61b5a86852 100644 --- a/lib/dns/rdata/generic/rp_17.c +++ b/lib/dns/rdata/generic/rp_17.c @@ -104,8 +104,8 @@ fromwire_rp(ARGS_FROMWIRE) { dns_name_init(&rmail, NULL); dns_name_init(&email, NULL); - RETERR(dns_name_fromwire(&rmail, source, dctx, options, target)); - return (dns_name_fromwire(&email, source, dctx, options, target)); + RETERR(dns_name_fromwire(&rmail, source, dctx, target)); + return (dns_name_fromwire(&email, source, dctx, target)); } static isc_result_t diff --git a/lib/dns/rdata/generic/rrsig_46.c b/lib/dns/rdata/generic/rrsig_46.c index c95944f5ce..e730420622 100644 --- a/lib/dns/rdata/generic/rrsig_46.c +++ b/lib/dns/rdata/generic/rrsig_46.c @@ -328,7 +328,7 @@ fromwire_rrsig(ARGS_FROMWIRE) { * Signer. */ dns_name_init(&name, NULL); - RETERR(dns_name_fromwire(&name, source, dctx, options, target)); + RETERR(dns_name_fromwire(&name, source, dctx, target)); /* * Sig. diff --git a/lib/dns/rdata/generic/rt_21.c b/lib/dns/rdata/generic/rt_21.c index a22ff600d7..b6185bec85 100644 --- a/lib/dns/rdata/generic/rt_21.c +++ b/lib/dns/rdata/generic/rt_21.c @@ -112,7 +112,7 @@ fromwire_rt(ARGS_FROMWIRE) { memmove(tregion.base, sregion.base, 2); isc_buffer_forward(source, 2); isc_buffer_add(target, 2); - return (dns_name_fromwire(&name, source, dctx, options, target)); + return (dns_name_fromwire(&name, source, dctx, target)); } static isc_result_t diff --git a/lib/dns/rdata/generic/sig_24.c b/lib/dns/rdata/generic/sig_24.c index e21f74b6b7..74e536f1ac 100644 --- a/lib/dns/rdata/generic/sig_24.c +++ b/lib/dns/rdata/generic/sig_24.c @@ -291,7 +291,7 @@ fromwire_sig(ARGS_FROMWIRE) { * Signer. */ dns_name_init(&name, NULL); - RETERR(dns_name_fromwire(&name, source, dctx, options, target)); + RETERR(dns_name_fromwire(&name, source, dctx, target)); /* * Sig. diff --git a/lib/dns/rdata/generic/sink_40.c b/lib/dns/rdata/generic/sink_40.c index 409dc64ba3..caabeb14c6 100644 --- a/lib/dns/rdata/generic/sink_40.c +++ b/lib/dns/rdata/generic/sink_40.c @@ -112,7 +112,6 @@ fromwire_sink(ARGS_FROMWIRE) { UNUSED(type); UNUSED(rdclass); UNUSED(dctx); - UNUSED(options); isc_buffer_activeregion(source, &sr); if (sr.length < 3) { diff --git a/lib/dns/rdata/generic/soa_6.c b/lib/dns/rdata/generic/soa_6.c index e72ff5cc40..b8656ceedb 100644 --- a/lib/dns/rdata/generic/soa_6.c +++ b/lib/dns/rdata/generic/soa_6.c @@ -170,8 +170,8 @@ fromwire_soa(ARGS_FROMWIRE) { dns_name_init(&mname, NULL); dns_name_init(&rname, NULL); - RETERR(dns_name_fromwire(&mname, source, dctx, options, target)); - RETERR(dns_name_fromwire(&rname, source, dctx, options, target)); + RETERR(dns_name_fromwire(&mname, source, dctx, target)); + RETERR(dns_name_fromwire(&rname, source, dctx, target)); isc_buffer_activeregion(source, &sregion); isc_buffer_availableregion(target, &tregion); diff --git a/lib/dns/rdata/generic/sshfp_44.c b/lib/dns/rdata/generic/sshfp_44.c index 581a51d44b..cb5f2f6e2f 100644 --- a/lib/dns/rdata/generic/sshfp_44.c +++ b/lib/dns/rdata/generic/sshfp_44.c @@ -132,7 +132,6 @@ fromwire_sshfp(ARGS_FROMWIRE) { UNUSED(type); UNUSED(rdclass); UNUSED(dctx); - UNUSED(options); isc_buffer_activeregion(source, &sr); if (sr.length < 2) { diff --git a/lib/dns/rdata/generic/talink_58.c b/lib/dns/rdata/generic/talink_58.c index 710efb5a98..6c38384348 100644 --- a/lib/dns/rdata/generic/talink_58.c +++ b/lib/dns/rdata/generic/talink_58.c @@ -93,8 +93,8 @@ fromwire_talink(ARGS_FROMWIRE) { dns_name_init(&prev, NULL); dns_name_init(&next, NULL); - RETERR(dns_name_fromwire(&prev, source, dctx, options, target)); - return (dns_name_fromwire(&next, source, dctx, options, target)); + RETERR(dns_name_fromwire(&prev, source, dctx, target)); + return (dns_name_fromwire(&next, source, dctx, target)); } static isc_result_t diff --git a/lib/dns/rdata/generic/tkey_249.c b/lib/dns/rdata/generic/tkey_249.c index 542da502b7..0c77c3733f 100644 --- a/lib/dns/rdata/generic/tkey_249.c +++ b/lib/dns/rdata/generic/tkey_249.c @@ -260,7 +260,7 @@ fromwire_tkey(ARGS_FROMWIRE) { * Algorithm. */ dns_name_init(&name, NULL); - RETERR(dns_name_fromwire(&name, source, dctx, options, target)); + RETERR(dns_name_fromwire(&name, source, dctx, target)); /* * Inception: 4 diff --git a/lib/dns/rdata/generic/tlsa_52.c b/lib/dns/rdata/generic/tlsa_52.c index f30a8e9ca3..78b79e494b 100644 --- a/lib/dns/rdata/generic/tlsa_52.c +++ b/lib/dns/rdata/generic/tlsa_52.c @@ -126,7 +126,6 @@ generic_fromwire_tlsa(ARGS_FROMWIRE) { UNUSED(type); UNUSED(rdclass); UNUSED(dctx); - UNUSED(options); isc_buffer_activeregion(source, &sr); diff --git a/lib/dns/rdata/generic/txt_16.c b/lib/dns/rdata/generic/txt_16.c index a10835f0a3..3acd66abdd 100644 --- a/lib/dns/rdata/generic/txt_16.c +++ b/lib/dns/rdata/generic/txt_16.c @@ -76,7 +76,6 @@ generic_fromwire_txt(ARGS_FROMWIRE) { UNUSED(type); UNUSED(dctx); UNUSED(rdclass); - UNUSED(options); do { result = txt_fromwire(source, target); diff --git a/lib/dns/rdata/generic/uri_256.c b/lib/dns/rdata/generic/uri_256.c index 3d838c0ae2..985a353975 100644 --- a/lib/dns/rdata/generic/uri_256.c +++ b/lib/dns/rdata/generic/uri_256.c @@ -105,7 +105,6 @@ fromwire_uri(ARGS_FROMWIRE) { UNUSED(type); UNUSED(rdclass); UNUSED(dctx); - UNUSED(options); /* * Priority, weight diff --git a/lib/dns/rdata/generic/x25_19.c b/lib/dns/rdata/generic/x25_19.c index db50970512..1b04b8b108 100644 --- a/lib/dns/rdata/generic/x25_19.c +++ b/lib/dns/rdata/generic/x25_19.c @@ -69,7 +69,6 @@ fromwire_x25(ARGS_FROMWIRE) { UNUSED(type); UNUSED(dctx); UNUSED(rdclass); - UNUSED(options); isc_buffer_activeregion(source, &sr); if (sr.length < 5 || sr.base[0] != (sr.length - 1)) { diff --git a/lib/dns/rdata/generic/zonemd_63.c b/lib/dns/rdata/generic/zonemd_63.c index 26801f78e6..ca522a64dd 100644 --- a/lib/dns/rdata/generic/zonemd_63.c +++ b/lib/dns/rdata/generic/zonemd_63.c @@ -148,7 +148,6 @@ fromwire_zonemd(ARGS_FROMWIRE) { UNUSED(type); UNUSED(rdclass); UNUSED(dctx); - UNUSED(options); isc_buffer_activeregion(source, &sr); diff --git a/lib/dns/rdata/hs_4/a_1.c b/lib/dns/rdata/hs_4/a_1.c index 26246b78b4..c9482fa923 100644 --- a/lib/dns/rdata/hs_4/a_1.c +++ b/lib/dns/rdata/hs_4/a_1.c @@ -71,7 +71,6 @@ fromwire_hs_a(ARGS_FROMWIRE) { UNUSED(type); UNUSED(dctx); - UNUSED(options); UNUSED(rdclass); isc_buffer_activeregion(source, &sregion); diff --git a/lib/dns/rdata/in_1/a6_38.c b/lib/dns/rdata/in_1/a6_38.c index 83716952aa..983cab4b2c 100644 --- a/lib/dns/rdata/in_1/a6_38.c +++ b/lib/dns/rdata/in_1/a6_38.c @@ -196,7 +196,7 @@ fromwire_in_a6(ARGS_FROMWIRE) { } dns_name_init(&name, NULL); - return (dns_name_fromwire(&name, source, dctx, options, target)); + return (dns_name_fromwire(&name, source, dctx, target)); } static isc_result_t diff --git a/lib/dns/rdata/in_1/a_1.c b/lib/dns/rdata/in_1/a_1.c index cf5549d485..4dafce0fab 100644 --- a/lib/dns/rdata/in_1/a_1.c +++ b/lib/dns/rdata/in_1/a_1.c @@ -74,7 +74,6 @@ fromwire_in_a(ARGS_FROMWIRE) { UNUSED(type); UNUSED(dctx); - UNUSED(options); UNUSED(rdclass); isc_buffer_activeregion(source, &sregion); diff --git a/lib/dns/rdata/in_1/aaaa_28.c b/lib/dns/rdata/in_1/aaaa_28.c index e23bd472d3..d1d3c164f5 100644 --- a/lib/dns/rdata/in_1/aaaa_28.c +++ b/lib/dns/rdata/in_1/aaaa_28.c @@ -90,7 +90,6 @@ fromwire_in_aaaa(ARGS_FROMWIRE) { UNUSED(type); UNUSED(dctx); - UNUSED(options); UNUSED(rdclass); isc_buffer_activeregion(source, &sregion); diff --git a/lib/dns/rdata/in_1/apl_42.c b/lib/dns/rdata/in_1/apl_42.c index d7f12f962f..7b00b71f15 100644 --- a/lib/dns/rdata/in_1/apl_42.c +++ b/lib/dns/rdata/in_1/apl_42.c @@ -193,7 +193,6 @@ fromwire_in_apl(ARGS_FROMWIRE) { UNUSED(type); UNUSED(dctx); UNUSED(rdclass); - UNUSED(options); isc_buffer_activeregion(source, &sr); isc_buffer_availableregion(target, &tr); @@ -277,7 +276,7 @@ fromstruct_in_apl(ARGS_FROMSTRUCT) { isc_buffer_add(&b, apl->apl_len); isc_buffer_setactive(&b, apl->apl_len); return (fromwire_in_apl(rdclass, type, &b, DNS_DECOMPRESS_DEFAULT, - false, target)); + target)); } static isc_result_t diff --git a/lib/dns/rdata/in_1/atma_34.c b/lib/dns/rdata/in_1/atma_34.c index e092d4ad3d..7ed338d235 100644 --- a/lib/dns/rdata/in_1/atma_34.c +++ b/lib/dns/rdata/in_1/atma_34.c @@ -149,7 +149,6 @@ fromwire_in_atma(ARGS_FROMWIRE) { UNUSED(type); UNUSED(dctx); - UNUSED(options); UNUSED(rdclass); isc_buffer_activeregion(source, ®ion); diff --git a/lib/dns/rdata/in_1/dhcid_49.c b/lib/dns/rdata/in_1/dhcid_49.c index 39c86dfb75..3ad50648e9 100644 --- a/lib/dns/rdata/in_1/dhcid_49.c +++ b/lib/dns/rdata/in_1/dhcid_49.c @@ -76,7 +76,6 @@ fromwire_in_dhcid(ARGS_FROMWIRE) { UNUSED(type); UNUSED(rdclass); UNUSED(dctx); - UNUSED(options); isc_buffer_activeregion(source, &sr); if (sr.length == 0) { diff --git a/lib/dns/rdata/in_1/eid_31.c b/lib/dns/rdata/in_1/eid_31.c index 160e3a3ac0..42e0910403 100644 --- a/lib/dns/rdata/in_1/eid_31.c +++ b/lib/dns/rdata/in_1/eid_31.c @@ -66,7 +66,6 @@ fromwire_in_eid(ARGS_FROMWIRE) { UNUSED(type); UNUSED(dctx); - UNUSED(options); UNUSED(rdclass); isc_buffer_activeregion(source, ®ion); diff --git a/lib/dns/rdata/in_1/kx_36.c b/lib/dns/rdata/in_1/kx_36.c index 9a271b9c70..b244fcad2e 100644 --- a/lib/dns/rdata/in_1/kx_36.c +++ b/lib/dns/rdata/in_1/kx_36.c @@ -99,7 +99,7 @@ fromwire_in_kx(ARGS_FROMWIRE) { } RETERR(mem_tobuffer(target, sregion.base, 2)); isc_buffer_forward(source, 2); - return (dns_name_fromwire(&name, source, dctx, options, target)); + return (dns_name_fromwire(&name, source, dctx, target)); } static isc_result_t diff --git a/lib/dns/rdata/in_1/nimloc_32.c b/lib/dns/rdata/in_1/nimloc_32.c index 2ed7fc6e51..852c80a0ea 100644 --- a/lib/dns/rdata/in_1/nimloc_32.c +++ b/lib/dns/rdata/in_1/nimloc_32.c @@ -66,7 +66,6 @@ fromwire_in_nimloc(ARGS_FROMWIRE) { UNUSED(type); UNUSED(dctx); - UNUSED(options); UNUSED(rdclass); isc_buffer_activeregion(source, ®ion); diff --git a/lib/dns/rdata/in_1/nsap-ptr_23.c b/lib/dns/rdata/in_1/nsap-ptr_23.c index a3cb908ca7..b36b049a9c 100644 --- a/lib/dns/rdata/in_1/nsap-ptr_23.c +++ b/lib/dns/rdata/in_1/nsap-ptr_23.c @@ -78,7 +78,7 @@ fromwire_in_nsap_ptr(ARGS_FROMWIRE) { dctx = dns_decompress_setpermitted(dctx, false); dns_name_init(&name, NULL); - return (dns_name_fromwire(&name, source, dctx, options, target)); + return (dns_name_fromwire(&name, source, dctx, target)); } static isc_result_t diff --git a/lib/dns/rdata/in_1/nsap_22.c b/lib/dns/rdata/in_1/nsap_22.c index bfe6c8cc24..465dd64c62 100644 --- a/lib/dns/rdata/in_1/nsap_22.c +++ b/lib/dns/rdata/in_1/nsap_22.c @@ -101,7 +101,6 @@ fromwire_in_nsap(ARGS_FROMWIRE) { UNUSED(type); UNUSED(dctx); - UNUSED(options); UNUSED(rdclass); isc_buffer_activeregion(source, ®ion); diff --git a/lib/dns/rdata/in_1/px_26.c b/lib/dns/rdata/in_1/px_26.c index 8f5af8783a..21d63dccce 100644 --- a/lib/dns/rdata/in_1/px_26.c +++ b/lib/dns/rdata/in_1/px_26.c @@ -136,12 +136,12 @@ fromwire_in_px(ARGS_FROMWIRE) { /* * MAP822. */ - RETERR(dns_name_fromwire(&name, source, dctx, options, target)); + RETERR(dns_name_fromwire(&name, source, dctx, target)); /* * MAPX400. */ - return (dns_name_fromwire(&name, source, dctx, options, target)); + return (dns_name_fromwire(&name, source, dctx, target)); } static isc_result_t diff --git a/lib/dns/rdata/in_1/srv_33.c b/lib/dns/rdata/in_1/srv_33.c index da07c95986..aab24e0ba1 100644 --- a/lib/dns/rdata/in_1/srv_33.c +++ b/lib/dns/rdata/in_1/srv_33.c @@ -166,7 +166,7 @@ fromwire_in_srv(ARGS_FROMWIRE) { /* * Target. */ - return (dns_name_fromwire(&name, source, dctx, options, target)); + return (dns_name_fromwire(&name, source, dctx, target)); } static isc_result_t diff --git a/lib/dns/rdata/in_1/svcb_64.c b/lib/dns/rdata/in_1/svcb_64.c index 2538d44678..7009ca6384 100644 --- a/lib/dns/rdata/in_1/svcb_64.c +++ b/lib/dns/rdata/in_1/svcb_64.c @@ -824,7 +824,7 @@ generic_fromwire_in_svcb(ARGS_FROMWIRE) { /* * TargetName. */ - RETERR(dns_name_fromwire(&name, source, dctx, options, target)); + RETERR(dns_name_fromwire(&name, source, dctx, target)); if (alias) { return (ISC_R_SUCCESS); diff --git a/lib/dns/rdata/in_1/wks_11.c b/lib/dns/rdata/in_1/wks_11.c index 88a46e2c87..ca55126fd1 100644 --- a/lib/dns/rdata/in_1/wks_11.c +++ b/lib/dns/rdata/in_1/wks_11.c @@ -217,7 +217,6 @@ fromwire_in_wks(ARGS_FROMWIRE) { UNUSED(type); UNUSED(dctx); - UNUSED(options); UNUSED(rdclass); isc_buffer_activeregion(source, &sr); diff --git a/tests/bench/dns_name_fromwire.c b/tests/bench/dns_name_fromwire.c index 6092ac2556..54a1879a9a 100644 --- a/tests/bench/dns_name_fromwire.c +++ b/tests/bench/dns_name_fromwire.c @@ -64,7 +64,7 @@ new_bench(const uint8_t *data, size_t size) { isc_buffer_setactive(&buf, size); while (isc_buffer_consumedlength(&buf) < size) { - result = dns_name_fromwire(name, &buf, dctx, 0, NULL); + result = dns_name_fromwire(name, &buf, dctx, NULL); if (result != ISC_R_SUCCESS) { isc_buffer_forward(&buf, 1); } diff --git a/tests/dns/name_test.c b/tests/dns/name_test.c index d38ab7cea0..c7d876efec 100644 --- a/tests/dns/name_test.c +++ b/tests/dns/name_test.c @@ -180,13 +180,13 @@ compress_test(const dns_name_t *name1, const dns_name_t *name2, dns_name_init(&name, NULL); RUNTIME_CHECK(isc_buffer_getuint16(&source) == 0xEAD); - RUNTIME_CHECK(dns_name_fromwire(&name, &source, dctx, 0, &target) == + RUNTIME_CHECK(dns_name_fromwire(&name, &source, dctx, &target) == ISC_R_SUCCESS); - RUNTIME_CHECK(dns_name_fromwire(&name, &source, dctx, 0, &target) == + RUNTIME_CHECK(dns_name_fromwire(&name, &source, dctx, &target) == ISC_R_SUCCESS); - RUNTIME_CHECK(dns_name_fromwire(&name, &source, dctx, 0, &target) == + RUNTIME_CHECK(dns_name_fromwire(&name, &source, dctx, &target) == ISC_R_SUCCESS); - RUNTIME_CHECK(dns_name_fromwire(&name, &source, dctx, 0, &target) == + RUNTIME_CHECK(dns_name_fromwire(&name, &source, dctx, &target) == ISC_R_SUCCESS); assert_int_equal(target.used, expanded_length); @@ -863,7 +863,7 @@ ISC_RUN_TEST_IMPL(fromwire_thread(void *arg) { isc_buffer_setactive(&source, sizeof(data)); dns_name_init(&name, NULL); - (void)dns_name_fromwire(&name, &source, &dctx, 0, &target); + (void)dns_name_fromwire(&name, &source, &dctx, &target); } return (NULL); diff --git a/tests/dns/rdata_test.c b/tests/dns/rdata_test.c index 5282122b06..6c13acdec4 100644 --- a/tests/dns/rdata_test.c +++ b/tests/dns/rdata_test.c @@ -150,7 +150,7 @@ wire_to_rdata(const unsigned char *src, size_t srclen, dns_rdataclass_t rdclass, * Try converting input data into uncompressed wire form. */ result = dns_rdata_fromwire(rdata, rdclass, type, &source, - DNS_DECOMPRESS_ALWAYS, 0, &target); + DNS_DECOMPRESS_ALWAYS, &target); return (result); }