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.

diff --git a/CHANGES b/CHANGES
index b8ec7679956e6ab9ed911d1a91407d8c57ee9971..0c599bcc8890f531d5d3ea77600bcb8d4c472429 100644 (file)
--- 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 ee4aae12f5c688ed1de84dd29f38d08aa989973d..2e0660810102cdb11258a07a62dae812c4dade0d 100644 (file)
--- 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 ec9e0d259012f6bb84de8cceeaf0ffef1bfb4dfa..6fd02a51e763761d95918783c8fb03ffc96c217a 100644 (file)
--- 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 67f3ce3830bb483640e4dd5728fc62b6723748ba..dee7d002825a2378759a93c8e2802fad7f2f4167 100644 (file)
--- 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 5e76b684a177f3645b0fcb3980c297f2c8ac6703..74a88882d67921b2eef48434d393ab16c9c8d9ab 100644 (file)
--- 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 2e27fc53f498249ffda59447bc9e1c023d0d9595..7f690ce9ab2a982f2d98f81b31b132c9f6084d4c 100644 (file)
--- 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 423f6fea0945b2078aeb7986d16d7b1ff029c97a..91239104439043de026a534d1a9545857a316abd 100644 (file)
--- 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 7bf080326ea50e91501dba853b2806da74432ab8..338af3a3a0ba849f85e264b0159bab635a8a66a3 100644 (file)
--- 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 fa3fdadb4413b2c2892e0cb938999a3c873131df..62038a01b249668619a168b37f7feffc2f68427b 100644 (file)
--- 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 23d55d28000905b24f36be3f4b903250b44a7470..8f15b554b7c2523997249ecb14210b5ae084e478 100644 (file)
--- 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 d2be3c227c2749c9538194aca7752f859b580de3..ef520169fddf14ee1aa05b4bce684d4528058dd6 100644 (file)
--- 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 0712191cb50cad6d5c1a844859b28a849ec93f75..7014e6c6acc04b5aa46a9e5a21875cb8aa350abb 100644 (file)
--- 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 a25e5e3941468ff5ac05ffe94cc60bf84c6709c2..b0688139f5cfefff0b3a672e647f4b19bb6f3c36 100644 (file)
--- 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 f7f9a9deb5899a0e4940d8adcb38c666e5d58b65..68dcbcbfd32d1a001adc99ccf755ad7ea49f8a30 100644 (file)
--- 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 de04280456726dfd43d4b5618c551a25ef6f327a..b75f3c81ae9efa9e85459a5bc7170586b6b5327c 100644 (file)
--- 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 09051af0cc513338cce8c6f7bfd2f2349019ada1..55c0adb0bb212a08eefab3999f1f2c6cbae9ee25 100644 (file)
--- 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 3b2404847925af96e0065c6392f315dc3b267485..a2362f3b700155c8c4b22d12a1e5ee790fce8d67 100644 (file)
--- 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 b2a45a851da19f1bbba45b9370fc6f76e3750681..6d8ac21456a8ce77d2c9da13fcb6ce03613046de 100644 (file)
--- 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 b6845f74a5ae0ce6a71efd807aa93b7cf514db01..a6eee8e574f47019c8764592ba8b3469d39a00a9 100644 (file)
--- 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 846027e804e223750dfe6feb54ca9d3eb0cb21d3..92d62dbb1c1959fd6474e50c2c6e49d80d55425f 100644 (file)
--- 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 3cc6918c5253c5b4d2eda4e5a8f5390f6443ccf6..754aef90604abaaff8f684b74e40a1b24141c44e 100644 (file)
--- 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 aabc0fa5c6fa52d577af9c6427687fa65ce934bf..311ba00cea442308a6c4be02b470ae408fe830f5 100644 (file)
--- 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 b061ccb13a4f81ea5d0d398409f213fa3e407790..d1d1f5208349f86de87028b23a09407d333888d0 100644 (file)
--- 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 ad53507a03c939910fbea2133717cca12d3301d5..442149d29a1d09ca5f0dfaf2587929f10e81ce8b 100644 (file)
--- 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 cbae52d044a1f62f2266ee7ab29d5b938458b660..2af212333a7fb53b879bfa3d24ae0d8334ca4936 100644 (file)
--- 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 25603b29e2528b81fa02b2238a796e7c11761c62..8dfdc74c5aa4d1eb3d56634a3c1522e35f0933b5 100644 (file)
--- 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 93978d2ed970ce7e8f9f298a6907107450d78241..2c25319e30044f1fcec8af9bdb315e398ee32ac5 100644 (file)
--- 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 011434db8bb2d534d25bf78262ac412790f7e6d1..38729801a05469a16d1afb3f45f6ea0cb4df36cf 100644 (file)
--- 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 0031615bf5efc307e34708416ee6b9da3b19cf79..a447019cfc66d11f585a58fefd345c3b1eb79d7c 100644 (file)
--- 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 c12d7da1ac420a13839d5ec2a08fa54f4d964b3f..8b347bc258a1108be1227a6bb7937006ee41ab77 100644 (file)
--- 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 c69280d79f16e30d1bbc538e2e810418a2230221..73214a9ee6c700f58087e5173a093baf27e5d18f 100644 (file)
--- 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, &region);
                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 8680613fd7e4fe15371be3d1707e20a976998276..a118e63bc9a32fe8a06929b900bd88b85fafe4fa 100644 (file)
--- 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 c8fdfab5f8bda6844b47e1254d2f9b9ced4e2c62..d1ab0ad03017217b66edc68473502440d4c2bc49 100644 (file)
--- 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 34666b3fac6e8ebb4ed6be1e51349acfea837fb9..9e00a77ab74d2de8870c1110a063dc989b04b720 100644 (file)
--- 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 7ab65180d03b87309bc69705633a4f39cd899500..616a5a303222fb821dd48d63689eafff8c3355fd 100644 (file)
--- 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 ee28f2e235b40df476f3232484c646441a7af993..37dace548ddbcc07c0b93a327b504ead987818b7 100644 (file)
--- 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 c05e14426d7a9b3b4950b0177a86106fee0d2d72..a35a303a1fc482f6534e38de6a3a06a70790b750 100644 (file)
--- 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 d02e4aa00d019545f9dddf4eef4261c182b2219a..b1889d71193959b612a8562a6cb8be6ed10c455c 100644 (file)
--- 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 64e3ed32362f9acb0ee20cab0344c6ff74f81127..a44f37ba5fbc7cd84ed0efd9c29f88bd38080d3b 100644 (file)
--- 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 e817ac03388550d6c07e341253a27566aa0bee85..eca3d18f1f88228b05e701c8d17c06dadf60a364 100644 (file)
--- 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 e28878f3345cab92bf5f714e5d1726d70c778888..d354871f18c679b9d29dfe4b09d9ad77ee8eb884 100644 (file)
--- 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 60c85c3ba807fc38197c73a5cfe6b846359d155b..a4da9912945bd588be93b014818f1ffa4d2f4a50 100644 (file)
--- 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 3ccf77a0999fc3b536ba43637420c670a881b3fe..25671f8a534398520636880d42645c660a7c306a 100644 (file)
--- 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 5fc77963d46b54c5d6f4f8ddb4408fbd9763d455..c88bc6f00746d5b1c2d9f59b5b7b2e3e9c6e194a 100644 (file)
--- 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 a914540ccce825ea52089d5a7a098f0578ffa9f6..e75828a23e409eaba7cf9f45a0344d95d0e668e0 100644 (file)
--- 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 5babd31b93152573dbaedc0c0401935ffd4829bd..ae2a4f95952495510999003f7dd9dafeb448fb21 100644 (file)
--- 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 8a958130c2aa4abd83d18b3bbede7b40a94bf29a..2ae714aa5dbfed11e80e9503a7d1f643fba535a5 100644 (file)
--- 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 32b543065695de91f5fc73a26f0e87f36cf2c54c..c7f12b19c1b1032b0fcd4735db362327c5a12c69 100644 (file)
--- 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 0b4db4cd386b6dacbef5cc4aec5f7a68f09b4c71..463cc4d9cd1128841496ed99f5cdf18e4b0ef784 100644 (file)
--- 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 c7e9620b905e51bcb546e5364a3f028806cc5cdd..3c8682b6e6f88c69cf5684869513168144206e26 100644 (file)
--- 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 e36ff655520895933f07fad9a8c2a33949a26ac8..ef3403473b0bce868d95837c6166aa97018aeb21 100644 (file)
--- 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 b4a4c304ba090b2c7c1f4645e6d85206f86a0eb7..522c4aabb972c26720de7f411df4d297514e6164 100644 (file)
--- 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 7d62c56a7445bb5aa208a9e386d5f76531e403ad..bdeac7e4d3eab84eb908f22ec49e72c3ea7aa6ce 100644 (file)
--- 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 26268774618716b77f4610aff2a4eba38b6f3262..5c8c3c73592a0470b54a81c185e33f1f745dcd71 100644 (file)
--- 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 a6fb103ba335f4c904b75c9e065e15105e307bcf..ce22cd9502b47c0f64f5fe53c9119a5247451ec4 100644 (file)
--- 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 8acffe797e406d2338ac8ed4ba4cf60f94040ddb..8e30909191a3a138a8dba8016517867357de9a5b 100644 (file)
--- 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 dfba5feca9299d36d21937fc626bf71b69d12dff..61b5a8685218e625f41427120b8506f1b7f3ced3 100644 (file)
--- 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 c95944f5ce2155234f7b933409ad7d344b40dc44..e73042062227870253c3ffa4d8ef625435e589b3 100644 (file)
--- 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 a22ff600d724d5e3ae4b7e1a1797cdafcaa1ff93..b6185bec85f671ac2091c054342d5400f2a04a6c 100644 (file)
--- 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 e21f74b6b7cd3ef33d9ed5388a5c1b4e767fac5f..74e536f1ace2332882b247831ad3a648dfe7dfa1 100644 (file)
--- 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 409dc64ba34e12f1dab9c6765e5be57a2f054b5a..caabeb14c64c800c912af8bc5df2613b09973ba2 100644 (file)
--- 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 e72ff5cc40e07b6542ce83ccfb3dde9c036f4641..b8656ceedbd43a7eeeaffa374b8b820417072bd3 100644 (file)
--- 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 581a51d44be85514e116a5976699ba3b438c6d60..cb5f2f6e2f9e2d5afa3627ffe78289bea0f9e73a 100644 (file)
--- 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 710efb5a98cd3b8e847732da2d4cabe63830dac4..6c3838434865bf8ba6e42689b5e7e9fcd96a850c 100644 (file)
--- 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 542da502b7a5884ab29e3848a01c76d3f52ac005..0c77c3733f015f5f9d1a744bdefbcb89b8c31c2a 100644 (file)
--- 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 f30a8e9ca380836f4f053c26de96afb56e96f360..78b79e494bb9ac4fbe8743be1f1606480f5cf4d2 100644 (file)
--- 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 a10835f0a3c58c2b7cb64cc67b09dd207703ed4b..3acd66abdd4e9423398f9308bb8740f357e30c27 100644 (file)
--- 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 3d838c0ae2d71bd0a0720ca16c3d7c725f1fb33e..985a35397529b99dee3ded0b691743962ef66d75 100644 (file)
--- 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 db5097051220a77d6e1d2e7d2a5ae2c7bcc54b4c..1b04b8b108fac431df5a8ce550ebe2160c0ec952 100644 (file)
--- 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 26801f78e655ed0dde9f0c89cae0a75b5a3a1f0f..ca522a64dddfed5acfed5b45c1534972deecb660 100644 (file)
--- 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 26246b78b4fa0877044a7baf7b29b9eca1b481c9..c9482fa92329a064de263b1b6dd6c5d80626197f 100644 (file)
--- 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 83716952aa02cb9a9965f5f8c4f5bad4745ef456..983cab4b2c100a1f55c0734e43a6e89097c49837 100644 (file)
--- 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 cf5549d48539f6dd65ad9e8f6e80c0d63f1dc321..4dafce0fab7d04547a23039d19e96a072c62edc6 100644 (file)
--- 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 e23bd472d34432674e9dcbfe2b33914bda6a33c2..d1d3c164f5611acb5153b177cb36b9ee5e578fba 100644 (file)
--- 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 d7f12f962fae2a69d694b6bc82e9c33f0d8563f6..7b00b71f15f988ff6072207d28877ef1a91965f4 100644 (file)
--- 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 e092d4ad3d2b79bb968703293426c12a37b6fa8f..7ed338d2353c755a3570416c6cc8c8fb2c84496f 100644 (file)
--- 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, &region);

diff --git a/lib/dns/rdata/in_1/dhcid_49.c b/lib/dns/rdata/in_1/dhcid_49.c
index 39c86dfb75744313010b5a702b606faeb7e4efed..3ad50648e9209df66622efec1804e78319e8999a 100644 (file)
--- 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 160e3a3ac083fe551f98844f1ea27ddc67e46bc7..42e0910403b47360b614e2adea69a27abe9edf83 100644 (file)
--- 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, &region);

diff --git a/lib/dns/rdata/in_1/kx_36.c b/lib/dns/rdata/in_1/kx_36.c
index 9a271b9c706caed55f9a34413f4316614bb86ebf..b244fcad2e1e2134abc1e8764fedb664a35505d6 100644 (file)
--- 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 2ed7fc6e516f0503647a57e705bd2b88c94354f2..852c80a0eabf28d40212998e374271ba546d2b1d 100644 (file)
--- 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, &region);

diff --git a/lib/dns/rdata/in_1/nsap-ptr_23.c b/lib/dns/rdata/in_1/nsap-ptr_23.c
index a3cb908ca755d5f1a0a8a4bc95e1343b881ad903..b36b049a9cd5950574c24533adb8abacb5894035 100644 (file)
--- 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 bfe6c8cc24d3fec8bb705c5eb6cf8032d8c65ed1..465dd64c62efc4bb728de7f831d73930a2b274ab 100644 (file)
--- 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, &region);

diff --git a/lib/dns/rdata/in_1/px_26.c b/lib/dns/rdata/in_1/px_26.c
index 8f5af8783a150a199fef0c6e3ddad35747a0784b..21d63dccce3a6a1cdb456122fe26c8c62cd532f8 100644 (file)
--- 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 da07c9598637f95694a52a610a7009aa636c5d4f..aab24e0ba10ba9ddd012b9dc9207b40532c13360 100644 (file)
--- 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 2538d44678f531fedc6c5bb361852f56ee49a13c..7009ca6384a99b386862298951bbde1625812550 100644 (file)
--- 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 88a46e2c878e7e3d15c8b2fb8d66b91b8bceaa66..ca55126fd1d945a475f5357f8172d861472b53f0 100644 (file)
--- 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 6092ac255647e41ee53cd01597daec9027035c32..54a1879a9ac0cc5cf8f87c65541d2d12294c553c 100644 (file)
--- 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 d38ab7cea0c8bb0d1862de9a4a3fd0072fec2ff9..c7d876efecfb85653a107e6d7f98bd12ff5a0547 100644 (file)
--- 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 5282122b063a0144adcca21adf3a3c035f43b48b..6c13acdec4902e972df68906546232beb786a788 100644 (file)
--- 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);
 }