diff options
| author | Florian Obser <florian@cvs.openbsd.org> | 2020-02-24 12:06:52 +0000 |
|---|---|---|
| committer | Florian Obser <florian@cvs.openbsd.org> | 2020-02-24 12:06:52 +0000 |
| commit | 8698348e98435e443b51811bbb7a49f2a2cff9bc (patch) | |
| tree | 8528e8f8afe9b89e426280f3c822e5ffeed0d536 /usr.bin/dig/lib | |
| parent | 0b608aef6ab1f9b5feae6bc08d683834f87009cb (diff) | |
We only need to check the owner for nsec3 records, remove all the
rest.
OK jung
Diffstat (limited to 'usr.bin/dig/lib')
82 files changed, 61 insertions, 1033 deletions
diff --git a/usr.bin/dig/lib/dns/gen.c b/usr.bin/dig/lib/dns/gen.c index de09ae81159..12a4889cf64 100644 --- a/usr.bin/dig/lib/dns/gen.c +++ b/usr.bin/dig/lib/dns/gen.c @@ -638,9 +638,6 @@ main(int argc, char **argv) { TOSTRUCTTYPE, TOSTRUCTCLASS, TOSTRUCTDEF); doswitch("FREESTRUCTSWITCH", "freestruct", FREESTRUCTARGS, FREESTRUCTTYPE, FREESTRUCTCLASS, FREESTRUCTDEF); - doswitch("CHECKOWNERSWITCH", "checkowner", - CHECKOWNERARGS, CHECKOWNERTYPE, - CHECKOWNERCLASS, CHECKOWNERDEF); /* * From here down, we are processing the rdata names and diff --git a/usr.bin/dig/lib/dns/include/dns/name.h b/usr.bin/dig/lib/dns/include/dns/name.h index ffa3f8fc572..a9975c91b61 100644 --- a/usr.bin/dig/lib/dns/include/dns/name.h +++ b/usr.bin/dig/lib/dns/include/dns/name.h @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: name.h,v 1.7 2020/02/23 19:54:25 jung Exp $ */ +/* $Id: name.h,v 1.8 2020/02/24 12:06:50 florian Exp $ */ #ifndef DNS_NAME_H #define DNS_NAME_H 1 @@ -1042,11 +1042,4 @@ dns_name_ismailbox(const dns_name_t *name); {NULL, NULL} \ } -#define DNS_NAME_INITNONABSOLUTE(A,B) { \ - A, (sizeof(A) - 1), sizeof(B), \ - DNS_NAMEATTR_READONLY, \ - B, NULL, { (void *)-1, (void *)-1}, \ - {NULL, NULL} \ -} - #endif /* DNS_NAME_H */ diff --git a/usr.bin/dig/lib/dns/include/dns/rdata.h b/usr.bin/dig/lib/dns/include/dns/rdata.h index ff4e52d8f64..1884a221aea 100644 --- a/usr.bin/dig/lib/dns/include/dns/rdata.h +++ b/usr.bin/dig/lib/dns/include/dns/rdata.h @@ -499,7 +499,7 @@ dns_rdata_covers(dns_rdata_t *rdata); */ isc_boolean_t -dns_rdata_checkowner(dns_name_t* name, dns_rdataclass_t rdclass, +dns_rdata_checkowner_nsec3(dns_name_t* name, dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_boolean_t wildcard); /* * Returns whether this is a valid ownername for this <type,class>. diff --git a/usr.bin/dig/lib/dns/message.c b/usr.bin/dig/lib/dns/message.c index 8d6c2fb9b5c..b258dc45ffc 100644 --- a/usr.bin/dig/lib/dns/message.c +++ b/usr.bin/dig/lib/dns/message.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: message.c,v 1.12 2020/02/24 12:06:13 florian Exp $ */ +/* $Id: message.c,v 1.13 2020/02/24 12:06:50 florian Exp $ */ /*! \file */ @@ -1258,7 +1258,7 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx, * Check the ownername of NSEC3 records */ if (rdtype == dns_rdatatype_nsec3 && - !dns_rdata_checkowner(name, msg->rdclass, rdtype, + !dns_rdata_checkowner_nsec3(name, msg->rdclass, rdtype, ISC_FALSE)) { result = DNS_R_BADOWNERNAME; goto cleanup; diff --git a/usr.bin/dig/lib/dns/rdata.c b/usr.bin/dig/lib/dns/rdata.c index 4fcdef5afc9..d38d8f4d8ba 100644 --- a/usr.bin/dig/lib/dns/rdata.c +++ b/usr.bin/dig/lib/dns/rdata.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: rdata.c,v 1.15 2020/02/24 12:06:13 florian Exp $ */ +/* $Id: rdata.c,v 1.16 2020/02/24 12:06:50 florian Exp $ */ /*! \file */ @@ -203,15 +203,6 @@ generic_tostruct_tlsa(ARGS_TOSTRUCT); static void generic_freestruct_tlsa(ARGS_FREESTRUCT); -/* - * Active Diretory gc._msdcs.<forest> prefix. - */ -static unsigned char gc_msdcs_data[] = "\002gc\006_msdcs"; -static unsigned char gc_msdcs_offset [] = { 0, 3 }; - -static dns_name_t const gc_msdcs = - DNS_NAME_INITNONABSOLUTE(gc_msdcs_data, gc_msdcs_offset); - static inline isc_result_t name_duporclone(dns_name_t *source, dns_name_t *target) { @@ -709,13 +700,10 @@ dns_rdata_freestruct(void *source) { } isc_boolean_t -dns_rdata_checkowner(dns_name_t *name, dns_rdataclass_t rdclass, +dns_rdata_checkowner_nsec3(dns_name_t *name, dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_boolean_t wildcard) { - isc_boolean_t result; - - CHECKOWNERSWITCH - return (result); + return checkowner_nsec3(name, rdclass, type, wildcard); } unsigned int diff --git a/usr.bin/dig/lib/dns/rdata/any_255/tsig_250.c b/usr.bin/dig/lib/dns/rdata/any_255/tsig_250.c index 555bd2f37a5..2e34d25fdab 100644 --- a/usr.bin/dig/lib/dns/rdata/any_255/tsig_250.c +++ b/usr.bin/dig/lib/dns/rdata/any_255/tsig_250.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: tsig_250.c,v 1.4 2020/02/24 12:06:13 florian Exp $ */ +/* $Id: tsig_250.c,v 1.5 2020/02/24 12:06:50 florian Exp $ */ /* Reviewed: Thu Mar 16 13:39:43 PST 2000 by gson */ @@ -401,19 +401,6 @@ freestruct_any_tsig(ARGS_FREESTRUCT) { free(tsig->other); } -static inline isc_boolean_t -checkowner_any_tsig(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_tsig); - REQUIRE(rdclass == dns_rdataclass_any); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_ANY_255_TSIG_250_C */ diff --git a/usr.bin/dig/lib/dns/rdata/ch_3/a_1.c b/usr.bin/dig/lib/dns/rdata/ch_3/a_1.c index b4a043d6500..e6907fb8e02 100644 --- a/usr.bin/dig/lib/dns/rdata/ch_3/a_1.c +++ b/usr.bin/dig/lib/dns/rdata/ch_3/a_1.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: a_1.c,v 1.4 2020/02/24 12:06:13 florian Exp $ */ +/* $Id: a_1.c,v 1.5 2020/02/24 12:06:50 florian Exp $ */ /* by Bjorn.Victor@it.uu.se, 2005-05-07 */ /* Based on generic/soa_6.c and generic/mx_15.c */ @@ -173,15 +173,5 @@ freestruct_ch_a(ARGS_FREESTRUCT) { dns_name_free(&a->ch_addr_dom); } -static inline isc_boolean_t -checkowner_ch_a(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_a); - REQUIRE(rdclass == dns_rdataclass_ch); - - UNUSED(type); - - return (dns_name_ishostname(name, wildcard)); -} #endif /* RDATA_CH_3_A_1_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/afsdb_18.c b/usr.bin/dig/lib/dns/rdata/generic/afsdb_18.c index 87a478fa0dd..fb87d9a6d35 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/afsdb_18.c +++ b/usr.bin/dig/lib/dns/rdata/generic/afsdb_18.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: afsdb_18.c,v 1.4 2020/02/24 12:06:13 florian Exp $ */ +/* $Id: afsdb_18.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* Reviewed: Wed Mar 15 14:59:00 PST 2000 by explorer */ @@ -159,17 +159,5 @@ freestruct_afsdb(ARGS_FREESTRUCT) { dns_name_free(&afsdb->server); } -static inline isc_boolean_t -checkowner_afsdb(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_afsdb); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_AFSDB_18_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/avc_258.c b/usr.bin/dig/lib/dns/rdata/generic/avc_258.c index 2e85b3cc601..92f2c5c6061 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/avc_258.c +++ b/usr.bin/dig/lib/dns/rdata/generic/avc_258.c @@ -86,17 +86,5 @@ freestruct_avc(ARGS_FREESTRUCT) { generic_freestruct_txt(source); } -static inline isc_boolean_t -checkowner_avc(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_avc); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_AVC_258_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/caa_257.c b/usr.bin/dig/lib/dns/rdata/generic/caa_257.c index 336cfb82f70..fcb08644eb2 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/caa_257.c +++ b/usr.bin/dig/lib/dns/rdata/generic/caa_257.c @@ -239,18 +239,6 @@ freestruct_caa(ARGS_FREESTRUCT) { free(caa->value); } -static inline isc_boolean_t -checkowner_caa(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_caa); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* GENERIC_CAA_257_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/cdnskey_60.c b/usr.bin/dig/lib/dns/rdata/generic/cdnskey_60.c index 5fab51823d6..05ffd8078e1 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/cdnskey_60.c +++ b/usr.bin/dig/lib/dns/rdata/generic/cdnskey_60.c @@ -88,18 +88,6 @@ freestruct_cdnskey(ARGS_FREESTRUCT) { generic_freestruct_key(source); } -static inline isc_boolean_t -checkowner_cdnskey(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_cdnskey); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_CDNSKEY_60_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/cds_59.c b/usr.bin/dig/lib/dns/rdata/generic/cds_59.c index a153eb42316..7839ae5284d 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/cds_59.c +++ b/usr.bin/dig/lib/dns/rdata/generic/cds_59.c @@ -93,18 +93,6 @@ freestruct_cds(ARGS_FREESTRUCT) { free(ds->digest); } -static inline isc_boolean_t -checkowner_cds(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_cds); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_CDS_59_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/cert_37.c b/usr.bin/dig/lib/dns/rdata/generic/cert_37.c index f7480192d59..38766fa3fd4 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/cert_37.c +++ b/usr.bin/dig/lib/dns/rdata/generic/cert_37.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: cert_37.c,v 1.4 2020/02/24 12:06:13 florian Exp $ */ +/* $Id: cert_37.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* Reviewed: Wed Mar 15 21:14:32 EST 2000 by tale */ @@ -168,17 +168,5 @@ freestruct_cert(ARGS_FREESTRUCT) { free(cert->certificate); } -static inline isc_boolean_t -checkowner_cert(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_cert); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_CERT_37_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/cname_5.c b/usr.bin/dig/lib/dns/rdata/generic/cname_5.c index 992d948356d..0a7e6d28c90 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/cname_5.c +++ b/usr.bin/dig/lib/dns/rdata/generic/cname_5.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: cname_5.c,v 1.4 2020/02/24 12:06:13 florian Exp $ */ +/* $Id: cname_5.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* reviewed: Wed Mar 15 16:48:45 PST 2000 by brister */ @@ -127,18 +127,6 @@ freestruct_cname(ARGS_FREESTRUCT) { dns_name_free(&cname->cname); } -static inline isc_boolean_t -checkowner_cname(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_cname); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_CNAME_5_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/csync_62.c b/usr.bin/dig/lib/dns/rdata/generic/csync_62.c index 419d37b2514..9e0d223c573 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/csync_62.c +++ b/usr.bin/dig/lib/dns/rdata/generic/csync_62.c @@ -161,17 +161,5 @@ freestruct_csync(ARGS_FREESTRUCT) { free(csync->typebits); } -static inline isc_boolean_t -checkowner_csync(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_csync); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_CSYNC_62_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/dlv_32769.c b/usr.bin/dig/lib/dns/rdata/generic/dlv_32769.c index 8640d536ae2..2fda2ae1962 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/dlv_32769.c +++ b/usr.bin/dig/lib/dns/rdata/generic/dlv_32769.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dlv_32769.c,v 1.4 2020/02/24 12:06:13 florian Exp $ */ +/* $Id: dlv_32769.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* RFC3658 */ @@ -90,18 +90,6 @@ freestruct_dlv(ARGS_FREESTRUCT) { free(dlv->digest); } -static inline isc_boolean_t -checkowner_dlv(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_dlv); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_DLV_32769_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/dname_39.c b/usr.bin/dig/lib/dns/rdata/generic/dname_39.c index d220b66b2ae..d86f5fe7ad3 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/dname_39.c +++ b/usr.bin/dig/lib/dns/rdata/generic/dname_39.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dname_39.c,v 1.4 2020/02/24 12:06:13 florian Exp $ */ +/* $Id: dname_39.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* Reviewed: Wed Mar 15 16:52:38 PST 2000 by explorer */ @@ -128,17 +128,5 @@ freestruct_dname(ARGS_FREESTRUCT) { dns_name_free(&dname->dname); } -static inline isc_boolean_t -checkowner_dname(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_dname); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_DNAME_39_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/dnskey_48.c b/usr.bin/dig/lib/dns/rdata/generic/dnskey_48.c index 47f46ac9c40..0a847a323da 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/dnskey_48.c +++ b/usr.bin/dig/lib/dns/rdata/generic/dnskey_48.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dnskey_48.c,v 1.4 2020/02/24 12:06:13 florian Exp $ */ +/* $Id: dnskey_48.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* * Reviewed: Wed Mar 15 16:47:10 PST 2000 by halley. @@ -95,18 +95,6 @@ freestruct_dnskey(ARGS_FREESTRUCT) { generic_freestruct_key(source); } -static inline isc_boolean_t -checkowner_dnskey(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_dnskey); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_DNSKEY_48_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/doa_259.c b/usr.bin/dig/lib/dns/rdata/generic/doa_259.c index 26635b6e85f..1f01890ec12 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/doa_259.c +++ b/usr.bin/dig/lib/dns/rdata/generic/doa_259.c @@ -225,17 +225,6 @@ freestruct_doa(ARGS_FREESTRUCT) { free(doa->data); } -static inline isc_boolean_t -checkowner_doa(ARGS_CHECKOWNER) { - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - REQUIRE(type == dns_rdatatype_doa); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_DOA_259_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/ds_43.c b/usr.bin/dig/lib/dns/rdata/generic/ds_43.c index 127decad242..3bbb21bad87 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/ds_43.c +++ b/usr.bin/dig/lib/dns/rdata/generic/ds_43.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: ds_43.c,v 1.5 2020/02/24 12:06:13 florian Exp $ */ +/* $Id: ds_43.c,v 1.6 2020/02/24 12:06:51 florian Exp $ */ /* RFC3658 */ @@ -244,18 +244,6 @@ freestruct_ds(ARGS_FREESTRUCT) { free(ds->digest); } -static inline isc_boolean_t -checkowner_ds(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_ds); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_DS_43_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/eui48_108.c b/usr.bin/dig/lib/dns/rdata/generic/eui48_108.c index 34fe5f2743f..8c7b78577d8 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/eui48_108.c +++ b/usr.bin/dig/lib/dns/rdata/generic/eui48_108.c @@ -107,18 +107,6 @@ freestruct_eui48(ARGS_FREESTRUCT) { return; } -static inline isc_boolean_t -checkowner_eui48(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_eui48); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_EUI48_108_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/eui64_109.c b/usr.bin/dig/lib/dns/rdata/generic/eui64_109.c index 2494baa2159..035e4560188 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/eui64_109.c +++ b/usr.bin/dig/lib/dns/rdata/generic/eui64_109.c @@ -110,18 +110,6 @@ freestruct_eui64(ARGS_FREESTRUCT) { return; } -static inline isc_boolean_t -checkowner_eui64(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_eui64); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_EUI64_109_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/gpos_27.c b/usr.bin/dig/lib/dns/rdata/generic/gpos_27.c index bb81a9e0dbf..cdbc3cc30f1 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/gpos_27.c +++ b/usr.bin/dig/lib/dns/rdata/generic/gpos_27.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: gpos_27.c,v 1.4 2020/02/24 12:06:13 florian Exp $ */ +/* $Id: gpos_27.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* reviewed: Wed Mar 15 16:48:45 PST 2000 by brister */ @@ -155,18 +155,6 @@ freestruct_gpos(ARGS_FREESTRUCT) { free(gpos->altitude); } -static inline isc_boolean_t -checkowner_gpos(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_gpos); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_GPOS_27_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/hinfo_13.c b/usr.bin/dig/lib/dns/rdata/generic/hinfo_13.c index b99df16fb32..60ba0652f2b 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/hinfo_13.c +++ b/usr.bin/dig/lib/dns/rdata/generic/hinfo_13.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: hinfo_13.c,v 1.4 2020/02/24 12:06:13 florian Exp $ */ +/* $Id: hinfo_13.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* * Reviewed: Wed Mar 15 16:47:10 PST 2000 by halley. @@ -128,17 +128,5 @@ freestruct_hinfo(ARGS_FREESTRUCT) { free(hinfo->os); } -static inline isc_boolean_t -checkowner_hinfo(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_hinfo); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_HINFO_13_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/hip_55.c b/usr.bin/dig/lib/dns/rdata/generic/hip_55.c index c1681619e5a..6018738d5f2 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/hip_55.c +++ b/usr.bin/dig/lib/dns/rdata/generic/hip_55.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: hip_55.c,v 1.5 2020/02/24 12:06:13 florian Exp $ */ +/* $Id: hip_55.c,v 1.6 2020/02/24 12:06:51 florian Exp $ */ /* reviewed: TBC */ @@ -250,18 +250,6 @@ freestruct_hip(ARGS_FREESTRUCT) { free(hip->servers); } -static inline isc_boolean_t -checkowner_hip(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_hip); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} isc_result_t dns_rdata_hip_first(dns_rdata_hip_t *hip) { diff --git a/usr.bin/dig/lib/dns/rdata/generic/ipseckey_45.c b/usr.bin/dig/lib/dns/rdata/generic/ipseckey_45.c index 79f6b191260..ca591e08ae6 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/ipseckey_45.c +++ b/usr.bin/dig/lib/dns/rdata/generic/ipseckey_45.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: ipseckey_45.c,v 1.4 2020/02/24 12:06:13 florian Exp $ */ +/* $Id: ipseckey_45.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ #ifndef RDATA_GENERIC_IPSECKEY_45_C #define RDATA_GENERIC_IPSECKEY_45_C @@ -299,18 +299,6 @@ freestruct_ipseckey(ARGS_FREESTRUCT) { } -static inline isc_boolean_t -checkowner_ipseckey(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_ipseckey); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_IPSECKEY_45_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/isdn_20.c b/usr.bin/dig/lib/dns/rdata/generic/isdn_20.c index 308510bbed1..3f93a32b04b 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/isdn_20.c +++ b/usr.bin/dig/lib/dns/rdata/generic/isdn_20.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: isdn_20.c,v 1.4 2020/02/24 12:06:13 florian Exp $ */ +/* $Id: isdn_20.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* Reviewed: Wed Mar 15 16:53:11 PST 2000 by bwelling */ @@ -139,18 +139,6 @@ freestruct_isdn(ARGS_FREESTRUCT) { free(isdn->subaddress); } -static inline isc_boolean_t -checkowner_isdn(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_isdn); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_ISDN_20_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/key_25.c b/usr.bin/dig/lib/dns/rdata/generic/key_25.c index 50573065e33..36ac81f8d54 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/key_25.c +++ b/usr.bin/dig/lib/dns/rdata/generic/key_25.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: key_25.c,v 1.4 2020/02/24 12:06:13 florian Exp $ */ +/* $Id: key_25.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* * Reviewed: Wed Mar 15 16:47:10 PST 2000 by halley. @@ -309,18 +309,6 @@ freestruct_key(ARGS_FREESTRUCT) { generic_freestruct_key(source); } -static inline isc_boolean_t -checkowner_key(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_key); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_KEY_25_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/keydata_65533.c b/usr.bin/dig/lib/dns/rdata/generic/keydata_65533.c index 9cc1352995a..1b12f5daaa6 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/keydata_65533.c +++ b/usr.bin/dig/lib/dns/rdata/generic/keydata_65533.c @@ -325,18 +325,6 @@ freestruct_keydata(ARGS_FREESTRUCT) { free(keydata->data); } -static inline isc_boolean_t -checkowner_keydata(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_keydata); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* GENERIC_KEYDATA_65533_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/l32_105.c b/usr.bin/dig/lib/dns/rdata/generic/l32_105.c index 1425809535a..c29785049e6 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/l32_105.c +++ b/usr.bin/dig/lib/dns/rdata/generic/l32_105.c @@ -124,18 +124,6 @@ freestruct_l32(ARGS_FREESTRUCT) { return; } -static inline isc_boolean_t -checkowner_l32(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_l32); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_L32_105_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/l64_106.c b/usr.bin/dig/lib/dns/rdata/generic/l64_106.c index 498a2d16de8..b424540f3bd 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/l64_106.c +++ b/usr.bin/dig/lib/dns/rdata/generic/l64_106.c @@ -125,18 +125,6 @@ freestruct_l64(ARGS_FREESTRUCT) { return; } -static inline isc_boolean_t -checkowner_l64(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_l64); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_L64_106_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/loc_29.c b/usr.bin/dig/lib/dns/rdata/generic/loc_29.c index 510982054c0..ce4ae51e4ee 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/loc_29.c +++ b/usr.bin/dig/lib/dns/rdata/generic/loc_29.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: loc_29.c,v 1.4 2020/02/24 12:06:13 florian Exp $ */ +/* $Id: loc_29.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* Reviewed: Wed Mar 15 18:13:09 PST 2000 by explorer */ @@ -321,18 +321,6 @@ freestruct_loc(ARGS_FREESTRUCT) { UNUSED(loc); } -static inline isc_boolean_t -checkowner_loc(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_loc); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_LOC_29_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/lp_107.c b/usr.bin/dig/lib/dns/rdata/generic/lp_107.c index 736c0c43460..0ffcad600e9 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/lp_107.c +++ b/usr.bin/dig/lib/dns/rdata/generic/lp_107.c @@ -137,18 +137,6 @@ freestruct_lp(ARGS_FREESTRUCT) { dns_name_free(&lp->lp); } -static inline isc_boolean_t -checkowner_lp(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_lp); - - UNUSED(type); - UNUSED(rdclass); - UNUSED(name); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_LP_107_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/mb_7.c b/usr.bin/dig/lib/dns/rdata/generic/mb_7.c index 1e82f945ab7..e309a9465fe 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/mb_7.c +++ b/usr.bin/dig/lib/dns/rdata/generic/mb_7.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: mb_7.c,v 1.4 2020/02/24 12:06:13 florian Exp $ */ +/* $Id: mb_7.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* Reviewed: Wed Mar 15 17:31:26 PST 2000 by bwelling */ @@ -126,17 +126,6 @@ freestruct_mb(ARGS_FREESTRUCT) { dns_name_free(&mb->mb); } -static inline isc_boolean_t -checkowner_mb(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_mb); - - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (dns_name_ismailbox(name)); -} #endif /* RDATA_GENERIC_MB_7_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/md_3.c b/usr.bin/dig/lib/dns/rdata/generic/md_3.c index 50f6878910f..596a6bfa22b 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/md_3.c +++ b/usr.bin/dig/lib/dns/rdata/generic/md_3.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: md_3.c,v 1.4 2020/02/24 12:06:13 florian Exp $ */ +/* $Id: md_3.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* Reviewed: Wed Mar 15 17:48:20 PST 2000 by bwelling */ @@ -127,18 +127,6 @@ freestruct_md(ARGS_FREESTRUCT) { dns_name_free(&md->md); } -static inline isc_boolean_t -checkowner_md(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_md); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_MD_3_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/mf_4.c b/usr.bin/dig/lib/dns/rdata/generic/mf_4.c index ca5561a16f9..7d25e3b9a84 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/mf_4.c +++ b/usr.bin/dig/lib/dns/rdata/generic/mf_4.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: mf_4.c,v 1.4 2020/02/24 12:06:13 florian Exp $ */ +/* $Id: mf_4.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* reviewed: Wed Mar 15 17:47:33 PST 2000 by brister */ @@ -127,18 +127,6 @@ freestruct_mf(ARGS_FREESTRUCT) { dns_name_free(&mf->mf); } -static inline isc_boolean_t -checkowner_mf(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_mf); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_MF_4_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/mg_8.c b/usr.bin/dig/lib/dns/rdata/generic/mg_8.c index 9dc614206c4..4143be1d250 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/mg_8.c +++ b/usr.bin/dig/lib/dns/rdata/generic/mg_8.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: mg_8.c,v 1.4 2020/02/24 12:06:13 florian Exp $ */ +/* $Id: mg_8.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* reviewed: Wed Mar 15 17:49:21 PST 2000 by brister */ @@ -127,17 +127,6 @@ freestruct_mg(ARGS_FREESTRUCT) { dns_name_free(&mg->mg); } -static inline isc_boolean_t -checkowner_mg(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_mg); - - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (dns_name_ismailbox(name)); -} #endif /* RDATA_GENERIC_MG_8_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/minfo_14.c b/usr.bin/dig/lib/dns/rdata/generic/minfo_14.c index ff4ab740d0a..ed9d4107fbf 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/minfo_14.c +++ b/usr.bin/dig/lib/dns/rdata/generic/minfo_14.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: minfo_14.c,v 1.4 2020/02/24 12:06:13 florian Exp $ */ +/* $Id: minfo_14.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* reviewed: Wed Mar 15 17:45:32 PST 2000 by brister */ @@ -170,18 +170,6 @@ freestruct_minfo(ARGS_FREESTRUCT) { dns_name_free(&minfo->emailbox); } -static inline isc_boolean_t -checkowner_minfo(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_minfo); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_MINFO_14_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/mr_9.c b/usr.bin/dig/lib/dns/rdata/generic/mr_9.c index 826abb18e80..f4fecfec5f0 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/mr_9.c +++ b/usr.bin/dig/lib/dns/rdata/generic/mr_9.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: mr_9.c,v 1.4 2020/02/24 12:06:13 florian Exp $ */ +/* $Id: mr_9.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* Reviewed: Wed Mar 15 21:30:35 EST 2000 by tale */ @@ -127,18 +127,6 @@ freestruct_mr(ARGS_FREESTRUCT) { dns_name_free(&mr->mr); } -static inline isc_boolean_t -checkowner_mr(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_mr); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_MR_9_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/mx_15.c b/usr.bin/dig/lib/dns/rdata/generic/mx_15.c index 9721df9e232..82741994673 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/mx_15.c +++ b/usr.bin/dig/lib/dns/rdata/generic/mx_15.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: mx_15.c,v 1.4 2020/02/24 12:06:13 florian Exp $ */ +/* $Id: mx_15.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* reviewed: Wed Mar 15 18:05:46 PST 2000 by brister */ @@ -151,16 +151,6 @@ freestruct_mx(ARGS_FREESTRUCT) { dns_name_free(&mx->mx); } -static inline isc_boolean_t -checkowner_mx(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_mx); - - UNUSED(type); - UNUSED(rdclass); - - return (dns_name_ishostname(name, wildcard)); -} #endif /* RDATA_GENERIC_MX_15_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/naptr_35.c b/usr.bin/dig/lib/dns/rdata/generic/naptr_35.c index 12ef6635e7b..36274452f05 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/naptr_35.c +++ b/usr.bin/dig/lib/dns/rdata/generic/naptr_35.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: naptr_35.c,v 1.4 2020/02/24 12:06:13 florian Exp $ */ +/* $Id: naptr_35.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* Reviewed: Thu Mar 16 16:52:50 PST 2000 by bwelling */ @@ -378,18 +378,6 @@ freestruct_naptr(ARGS_FREESTRUCT) { dns_name_free(&naptr->replacement); } -static inline isc_boolean_t -checkowner_naptr(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_naptr); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_NAPTR_35_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/nid_104.c b/usr.bin/dig/lib/dns/rdata/generic/nid_104.c index 6359127a6a6..a3d87e82a9d 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/nid_104.c +++ b/usr.bin/dig/lib/dns/rdata/generic/nid_104.c @@ -125,18 +125,6 @@ freestruct_nid(ARGS_FREESTRUCT) { return; } -static inline isc_boolean_t -checkowner_nid(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_nid); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_NID_104_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/ninfo_56.c b/usr.bin/dig/lib/dns/rdata/generic/ninfo_56.c index da651633819..7e6c27f830d 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/ninfo_56.c +++ b/usr.bin/dig/lib/dns/rdata/generic/ninfo_56.c @@ -85,18 +85,6 @@ freestruct_ninfo(ARGS_FREESTRUCT) { generic_freestruct_txt(source); } -static inline isc_boolean_t -checkowner_ninfo(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_ninfo); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_NINFO_56_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/ns_2.c b/usr.bin/dig/lib/dns/rdata/generic/ns_2.c index 5c75d94affa..fe6f206b1bb 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/ns_2.c +++ b/usr.bin/dig/lib/dns/rdata/generic/ns_2.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: ns_2.c,v 1.4 2020/02/24 12:06:13 florian Exp $ */ +/* $Id: ns_2.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* Reviewed: Wed Mar 15 18:15:00 PST 2000 by bwelling */ @@ -126,18 +126,6 @@ freestruct_ns(ARGS_FREESTRUCT) { dns_name_free(&ns->name); } -static inline isc_boolean_t -checkowner_ns(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_ns); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_NS_2_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/nsec3param_51.c b/usr.bin/dig/lib/dns/rdata/generic/nsec3param_51.c index 56abf1d4023..6b72ee0c58a 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/nsec3param_51.c +++ b/usr.bin/dig/lib/dns/rdata/generic/nsec3param_51.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: nsec3param_51.c,v 1.4 2020/02/24 12:06:13 florian Exp $ */ +/* $Id: nsec3param_51.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* * Copyright (C) 2004 Nominet, Ltd. @@ -194,18 +194,6 @@ freestruct_nsec3param(ARGS_FREESTRUCT) { free(nsec3param->salt); } -static inline isc_boolean_t -checkowner_nsec3param(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_nsec3param); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_NSEC3PARAM_51_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/nsec_47.c b/usr.bin/dig/lib/dns/rdata/generic/nsec_47.c index dae361e6b81..6c833781c0e 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/nsec_47.c +++ b/usr.bin/dig/lib/dns/rdata/generic/nsec_47.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: nsec_47.c,v 1.4 2020/02/24 12:06:13 florian Exp $ */ +/* $Id: nsec_47.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* reviewed: Wed Mar 15 18:21:15 PST 2000 by brister */ @@ -163,17 +163,5 @@ freestruct_nsec(ARGS_FREESTRUCT) { free(nsec->typebits); } -static inline isc_boolean_t -checkowner_nsec(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_nsec); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_NSEC_47_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/null_10.c b/usr.bin/dig/lib/dns/rdata/generic/null_10.c index 9c41d38639e..5b6f284c1f4 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/null_10.c +++ b/usr.bin/dig/lib/dns/rdata/generic/null_10.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: null_10.c,v 1.4 2020/02/24 12:06:13 florian Exp $ */ +/* $Id: null_10.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* Reviewed: Thu Mar 16 13:57:50 PST 2000 by explorer */ @@ -104,18 +104,6 @@ freestruct_null(ARGS_FREESTRUCT) { free(null->data); } -static inline isc_boolean_t -checkowner_null(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_null); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_NULL_10_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/nxt_30.c b/usr.bin/dig/lib/dns/rdata/generic/nxt_30.c index 422b7a9fe10..a66e54d0d2f 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/nxt_30.c +++ b/usr.bin/dig/lib/dns/rdata/generic/nxt_30.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: nxt_30.c,v 1.4 2020/02/24 12:06:13 florian Exp $ */ +/* $Id: nxt_30.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* reviewed: Wed Mar 15 18:21:15 PST 2000 by brister */ @@ -183,17 +183,5 @@ freestruct_nxt(ARGS_FREESTRUCT) { free(nxt->typebits); } -static inline isc_boolean_t -checkowner_nxt(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_nxt); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_NXT_30_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/openpgpkey_61.c b/usr.bin/dig/lib/dns/rdata/generic/openpgpkey_61.c index 58716ecdc85..020b4a48287 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/openpgpkey_61.c +++ b/usr.bin/dig/lib/dns/rdata/generic/openpgpkey_61.c @@ -144,18 +144,6 @@ freestruct_openpgpkey(ARGS_FREESTRUCT) { free(sig->keyring); } -static inline isc_boolean_t -checkowner_openpgpkey(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_openpgpkey); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_OPENPGPKEY_61_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/opt_41.c b/usr.bin/dig/lib/dns/rdata/generic/opt_41.c index d8481119aa1..a14740f6722 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/opt_41.c +++ b/usr.bin/dig/lib/dns/rdata/generic/opt_41.c @@ -265,17 +265,6 @@ freestruct_opt(ARGS_FREESTRUCT) { free(opt->options); } -static inline isc_boolean_t -checkowner_opt(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_opt); - - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (dns_name_equal(name, dns_rootname)); -} #endif /* RDATA_GENERIC_OPT_41_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/proforma.c b/usr.bin/dig/lib/dns/rdata/generic/proforma.c index f948954e1ff..ea429343970 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/proforma.c +++ b/usr.bin/dig/lib/dns/rdata/generic/proforma.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: proforma.c,v 1.4 2020/02/24 12:06:14 florian Exp $ */ +/* $Id: proforma.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ #ifndef RDATA_GENERIC_#_#_C #define RDATA_GENERIC_#_#_C @@ -90,19 +90,6 @@ freestruct_#(ARGS_FREESTRUCT) { } -static inline isc_boolean_t -checkowner_#(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_proforma.c#); - REQUIRE(rdclass == #); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_#_#_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/ptr_12.c b/usr.bin/dig/lib/dns/rdata/generic/ptr_12.c index eab57369aef..06ef868ef07 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/ptr_12.c +++ b/usr.bin/dig/lib/dns/rdata/generic/ptr_12.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: ptr_12.c,v 1.4 2020/02/24 12:06:14 florian Exp $ */ +/* $Id: ptr_12.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* Reviewed: Thu Mar 16 14:05:12 PST 2000 by explorer */ @@ -127,18 +127,6 @@ freestruct_ptr(ARGS_FREESTRUCT) { dns_name_free(&ptr->ptr); } -static inline isc_boolean_t -checkowner_ptr(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_ptr); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} static unsigned char ip6_arpa_data[] = "\003IP6\004ARPA"; static unsigned char ip6_arpa_offsets[] = { 0, 4, 9 }; diff --git a/usr.bin/dig/lib/dns/rdata/generic/rkey_57.c b/usr.bin/dig/lib/dns/rdata/generic/rkey_57.c index 0fcfc59f65b..df79f142a3a 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/rkey_57.c +++ b/usr.bin/dig/lib/dns/rdata/generic/rkey_57.c @@ -85,18 +85,6 @@ freestruct_rkey(ARGS_FREESTRUCT) { generic_freestruct_key(source); } -static inline isc_boolean_t -checkowner_rkey(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_rkey); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_RKEY_57_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/rp_17.c b/usr.bin/dig/lib/dns/rdata/generic/rp_17.c index c29bc9e78d6..caf7d8fb8db 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/rp_17.c +++ b/usr.bin/dig/lib/dns/rdata/generic/rp_17.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: rp_17.c,v 1.4 2020/02/24 12:06:14 florian Exp $ */ +/* $Id: rp_17.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* RFC1183 */ @@ -167,17 +167,5 @@ freestruct_rp(ARGS_FREESTRUCT) { dns_name_free(&rp->text); } -static inline isc_boolean_t -checkowner_rp(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_rp); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_RP_17_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/rrsig_46.c b/usr.bin/dig/lib/dns/rdata/generic/rrsig_46.c index 255ebdaaa70..9eb51ea1fd9 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/rrsig_46.c +++ b/usr.bin/dig/lib/dns/rdata/generic/rrsig_46.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: rrsig_46.c,v 1.4 2020/02/24 12:06:14 florian Exp $ */ +/* $Id: rrsig_46.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* Reviewed: Fri Mar 17 09:05:02 PST 2000 by gson */ @@ -381,18 +381,6 @@ covers_rrsig(dns_rdata_t *rdata) { return (type); } -static inline isc_boolean_t -checkowner_rrsig(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_rrsig); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_RRSIG_46_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/rt_21.c b/usr.bin/dig/lib/dns/rdata/generic/rt_21.c index ef0ab92ac56..671465b55f9 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/rt_21.c +++ b/usr.bin/dig/lib/dns/rdata/generic/rt_21.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: rt_21.c,v 1.4 2020/02/24 12:06:14 florian Exp $ */ +/* $Id: rt_21.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* reviewed: Thu Mar 16 15:02:31 PST 2000 by brister */ @@ -157,18 +157,6 @@ freestruct_rt(ARGS_FREESTRUCT) { dns_name_free(&rt->host); } -static inline isc_boolean_t -checkowner_rt(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_rt); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_RT_21_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/sig_24.c b/usr.bin/dig/lib/dns/rdata/generic/sig_24.c index 3ce91a97076..94f7c6ca9bc 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/sig_24.c +++ b/usr.bin/dig/lib/dns/rdata/generic/sig_24.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: sig_24.c,v 1.4 2020/02/24 12:06:14 florian Exp $ */ +/* $Id: sig_24.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* Reviewed: Fri Mar 17 09:05:02 PST 2000 by gson */ @@ -382,17 +382,5 @@ covers_sig(dns_rdata_t *rdata) { return (type); } -static inline isc_boolean_t -checkowner_sig(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_sig); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_SIG_24_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/sink_40.c b/usr.bin/dig/lib/dns/rdata/generic/sink_40.c index bdc7cc42c56..dbc924c25df 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/sink_40.c +++ b/usr.bin/dig/lib/dns/rdata/generic/sink_40.c @@ -173,17 +173,5 @@ freestruct_sink(ARGS_FREESTRUCT) { free(sink->data); } -static inline isc_boolean_t -checkowner_sink(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_sink); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_SINK_40_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/smimea_53.c b/usr.bin/dig/lib/dns/rdata/generic/smimea_53.c index 92036791860..104c93281f4 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/smimea_53.c +++ b/usr.bin/dig/lib/dns/rdata/generic/smimea_53.c @@ -82,18 +82,6 @@ freestruct_smimea(ARGS_FREESTRUCT) { generic_freestruct_tlsa(source); } -static inline isc_boolean_t -checkowner_smimea(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_smimea); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_SMIMEA_53_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/soa_6.c b/usr.bin/dig/lib/dns/rdata/generic/soa_6.c index 82a1f763570..d90f1e334a9 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/soa_6.c +++ b/usr.bin/dig/lib/dns/rdata/generic/soa_6.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: soa_6.c,v 1.4 2020/02/24 12:06:14 florian Exp $ */ +/* $Id: soa_6.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* Reviewed: Thu Mar 16 15:18:32 PST 2000 by explorer */ @@ -258,18 +258,6 @@ freestruct_soa(ARGS_FREESTRUCT) { dns_name_free(&soa->contact); } -static inline isc_boolean_t -checkowner_soa(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_soa); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_SOA_6_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/spf_99.c b/usr.bin/dig/lib/dns/rdata/generic/spf_99.c index 3c460c47a3f..65c551a85e7 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/spf_99.c +++ b/usr.bin/dig/lib/dns/rdata/generic/spf_99.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: spf_99.c,v 1.4 2020/02/24 12:06:14 florian Exp $ */ +/* $Id: spf_99.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* Reviewed: Thu Mar 16 15:40:00 PST 2000 by bwelling */ @@ -90,17 +90,5 @@ freestruct_spf(ARGS_FREESTRUCT) { generic_freestruct_txt(source); } -static inline isc_boolean_t -checkowner_spf(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_spf); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_SPF_99_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/sshfp_44.c b/usr.bin/dig/lib/dns/rdata/generic/sshfp_44.c index 9a1c4d73bb2..5683d4ea116 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/sshfp_44.c +++ b/usr.bin/dig/lib/dns/rdata/generic/sshfp_44.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: sshfp_44.c,v 1.4 2020/02/24 12:06:14 florian Exp $ */ +/* $Id: sshfp_44.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* RFC 4255 */ @@ -158,18 +158,6 @@ freestruct_sshfp(ARGS_FREESTRUCT) { free(sshfp->digest); } -static inline isc_boolean_t -checkowner_sshfp(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_sshfp); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_SSHFP_44_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/ta_32768.c b/usr.bin/dig/lib/dns/rdata/generic/ta_32768.c index 0b6b3c797ce..746ffe4fbc5 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/ta_32768.c +++ b/usr.bin/dig/lib/dns/rdata/generic/ta_32768.c @@ -87,18 +87,6 @@ freestruct_ta(ARGS_FREESTRUCT) { free(ds->digest); } -static inline isc_boolean_t -checkowner_ta(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_ta); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_TA_32768_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/talink_58.c b/usr.bin/dig/lib/dns/rdata/generic/talink_58.c index c37a8a62ba3..91eb46a70e9 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/talink_58.c +++ b/usr.bin/dig/lib/dns/rdata/generic/talink_58.c @@ -165,18 +165,6 @@ freestruct_talink(ARGS_FREESTRUCT) { dns_name_free(&talink->next); } -static inline isc_boolean_t -checkowner_talink(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_talink); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_TALINK_58_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/tkey_249.c b/usr.bin/dig/lib/dns/rdata/generic/tkey_249.c index 0dfbf05b02f..32303f95ad2 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/tkey_249.c +++ b/usr.bin/dig/lib/dns/rdata/generic/tkey_249.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: tkey_249.c,v 1.4 2020/02/24 12:06:14 florian Exp $ */ +/* $Id: tkey_249.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* * Reviewed: Thu Mar 16 17:35:30 PST 2000 by halley. @@ -382,17 +382,5 @@ freestruct_tkey(ARGS_FREESTRUCT) { free(tkey->other); } -static inline isc_boolean_t -checkowner_tkey(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_tkey); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_TKEY_249_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/tlsa_52.c b/usr.bin/dig/lib/dns/rdata/generic/tlsa_52.c index 4b070652826..b797b18b08a 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/tlsa_52.c +++ b/usr.bin/dig/lib/dns/rdata/generic/tlsa_52.c @@ -211,18 +211,6 @@ freestruct_tlsa(ARGS_FREESTRUCT) { generic_freestruct_tlsa(source); } -static inline isc_boolean_t -checkowner_tlsa(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_tlsa); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_TLSA_52_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/txt_16.c b/usr.bin/dig/lib/dns/rdata/generic/txt_16.c index 0e85f20f1db..83279e61aa9 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/txt_16.c +++ b/usr.bin/dig/lib/dns/rdata/generic/txt_16.c @@ -172,18 +172,6 @@ freestruct_txt(ARGS_FREESTRUCT) { generic_freestruct_txt(source); } -static inline isc_boolean_t -checkowner_txt(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_txt); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_TXT_16_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/unspec_103.c b/usr.bin/dig/lib/dns/rdata/generic/unspec_103.c index d32bca8de8f..e49174f069d 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/unspec_103.c +++ b/usr.bin/dig/lib/dns/rdata/generic/unspec_103.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: unspec_103.c,v 1.4 2020/02/24 12:06:14 florian Exp $ */ +/* $Id: unspec_103.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ #ifndef RDATA_GENERIC_UNSPEC_103_C #define RDATA_GENERIC_UNSPEC_103_C @@ -106,18 +106,6 @@ freestruct_unspec(ARGS_FREESTRUCT) { free(unspec->data); } -static inline isc_boolean_t -checkowner_unspec(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_unspec); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_UNSPEC_103_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/uri_256.c b/usr.bin/dig/lib/dns/rdata/generic/uri_256.c index 90a846b75f6..05a1f38cf5a 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/uri_256.c +++ b/usr.bin/dig/lib/dns/rdata/generic/uri_256.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: uri_256.c,v 1.4 2020/02/24 12:06:14 florian Exp $ */ +/* $Id: uri_256.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ #ifndef GENERIC_URI_256_C #define GENERIC_URI_256_C 1 @@ -178,18 +178,6 @@ freestruct_uri(ARGS_FREESTRUCT) { free(uri->target); } -static inline isc_boolean_t -checkowner_uri(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_uri); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* GENERIC_URI_256_C */ diff --git a/usr.bin/dig/lib/dns/rdata/generic/x25_19.c b/usr.bin/dig/lib/dns/rdata/generic/x25_19.c index d4f02c42c06..705f84347cd 100644 --- a/usr.bin/dig/lib/dns/rdata/generic/x25_19.c +++ b/usr.bin/dig/lib/dns/rdata/generic/x25_19.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: x25_19.c,v 1.4 2020/02/24 12:06:14 florian Exp $ */ +/* $Id: x25_19.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* Reviewed: Thu Mar 16 16:15:57 PST 2000 by bwelling */ @@ -124,18 +124,6 @@ freestruct_x25(ARGS_FREESTRUCT) { free(x25->x25); } -static inline isc_boolean_t -checkowner_x25(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_x25); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_GENERIC_X25_19_C */ diff --git a/usr.bin/dig/lib/dns/rdata/hs_4/a_1.c b/usr.bin/dig/lib/dns/rdata/hs_4/a_1.c index f704ada6c67..662d6288075 100644 --- a/usr.bin/dig/lib/dns/rdata/hs_4/a_1.c +++ b/usr.bin/dig/lib/dns/rdata/hs_4/a_1.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: a_1.c,v 1.4 2020/02/24 12:06:14 florian Exp $ */ +/* $Id: a_1.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* reviewed: Thu Mar 16 15:58:36 PST 2000 by brister */ @@ -131,19 +131,6 @@ freestruct_hs_a(ARGS_FREESTRUCT) { REQUIRE(source != NULL); } -static inline isc_boolean_t -checkowner_hs_a(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_a); - REQUIRE(rdclass == dns_rdataclass_hs); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_HS_4_A_1_C */ diff --git a/usr.bin/dig/lib/dns/rdata/in_1/a6_38.c b/usr.bin/dig/lib/dns/rdata/in_1/a6_38.c index 77f94cfa52f..d0eed333e9e 100644 --- a/usr.bin/dig/lib/dns/rdata/in_1/a6_38.c +++ b/usr.bin/dig/lib/dns/rdata/in_1/a6_38.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: a6_38.c,v 1.4 2020/02/24 12:06:14 florian Exp $ */ +/* $Id: a6_38.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* RFC2874 */ @@ -252,17 +252,6 @@ freestruct_in_a6(ARGS_FREESTRUCT) { dns_name_free(&a6->prefix); } -static inline isc_boolean_t -checkowner_in_a6(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_a6); - REQUIRE(rdclass == dns_rdataclass_in); - - UNUSED(type); - UNUSED(rdclass); - - return (dns_name_ishostname(name, wildcard)); -} #endif /* RDATA_IN_1_A6_38_C */ diff --git a/usr.bin/dig/lib/dns/rdata/in_1/a_1.c b/usr.bin/dig/lib/dns/rdata/in_1/a_1.c index b41c8ead4d9..3886db28711 100644 --- a/usr.bin/dig/lib/dns/rdata/in_1/a_1.c +++ b/usr.bin/dig/lib/dns/rdata/in_1/a_1.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: a_1.c,v 1.4 2020/02/24 12:06:14 florian Exp $ */ +/* $Id: a_1.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* Reviewed: Thu Mar 16 16:52:50 PST 2000 by bwelling */ @@ -138,31 +138,6 @@ freestruct_in_a(ARGS_FREESTRUCT) { UNUSED(a); } -static inline isc_boolean_t -checkowner_in_a(ARGS_CHECKOWNER) { - dns_name_t prefix, suffix; - - REQUIRE(type == dns_rdatatype_a); - REQUIRE(rdclass == dns_rdataclass_in); - - UNUSED(type); - UNUSED(rdclass); - - /* - * Handle Active Diretory gc._msdcs.<forest> name. - */ - if (dns_name_countlabels(name) > 2U) { - dns_name_init(&prefix, NULL); - dns_name_init(&suffix, NULL); - dns_name_split(name, dns_name_countlabels(name) - 2, - &prefix, &suffix); - if (dns_name_equal(&gc_msdcs, &prefix) && - dns_name_ishostname(&suffix, ISC_FALSE)) - return (ISC_TRUE); - } - - return (dns_name_ishostname(name, wildcard)); -} #endif /* RDATA_IN_1_A_1_C */ diff --git a/usr.bin/dig/lib/dns/rdata/in_1/aaaa_28.c b/usr.bin/dig/lib/dns/rdata/in_1/aaaa_28.c index c8ccb79694b..485731634ef 100644 --- a/usr.bin/dig/lib/dns/rdata/in_1/aaaa_28.c +++ b/usr.bin/dig/lib/dns/rdata/in_1/aaaa_28.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: aaaa_28.c,v 1.4 2020/02/24 12:06:14 florian Exp $ */ +/* $Id: aaaa_28.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* Reviewed: Thu Mar 16 16:52:50 PST 2000 by bwelling */ @@ -134,30 +134,5 @@ freestruct_in_aaaa(ARGS_FREESTRUCT) { UNUSED(aaaa); } -static inline isc_boolean_t -checkowner_in_aaaa(ARGS_CHECKOWNER) { - dns_name_t prefix, suffix; - - REQUIRE(type == dns_rdatatype_aaaa); - REQUIRE(rdclass == dns_rdataclass_in); - - UNUSED(type); - UNUSED(rdclass); - - /* - * Handle Active Diretory gc._msdcs.<forest> name. - */ - if (dns_name_countlabels(name) > 2U) { - dns_name_init(&prefix, NULL); - dns_name_init(&suffix, NULL); - dns_name_split(name, dns_name_countlabels(name) - 2, - &prefix, &suffix); - if (dns_name_equal(&gc_msdcs, &prefix) && - dns_name_ishostname(&suffix, ISC_FALSE)) - return (ISC_TRUE); - } - - return (dns_name_ishostname(name, wildcard)); -} #endif /* RDATA_IN_1_AAAA_28_C */ diff --git a/usr.bin/dig/lib/dns/rdata/in_1/apl_42.c b/usr.bin/dig/lib/dns/rdata/in_1/apl_42.c index fbf6044b356..a7eb89ae6b7 100644 --- a/usr.bin/dig/lib/dns/rdata/in_1/apl_42.c +++ b/usr.bin/dig/lib/dns/rdata/in_1/apl_42.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: apl_42.c,v 1.5 2020/02/24 12:06:14 florian Exp $ */ +/* $Id: apl_42.c,v 1.6 2020/02/24 12:06:51 florian Exp $ */ /* RFC3123 */ @@ -202,19 +202,6 @@ freestruct_in_apl(ARGS_FREESTRUCT) { free(apl->apl); } -static inline isc_boolean_t -checkowner_in_apl(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_apl); - REQUIRE(rdclass == dns_rdataclass_in); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_IN_1_APL_42_C */ diff --git a/usr.bin/dig/lib/dns/rdata/in_1/dhcid_49.c b/usr.bin/dig/lib/dns/rdata/in_1/dhcid_49.c index aa99d72081c..4121189d277 100644 --- a/usr.bin/dig/lib/dns/rdata/in_1/dhcid_49.c +++ b/usr.bin/dig/lib/dns/rdata/in_1/dhcid_49.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dhcid_49.c,v 1.4 2020/02/24 12:06:14 florian Exp $ */ +/* $Id: dhcid_49.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* RFC 4701 */ @@ -143,19 +143,6 @@ freestruct_in_dhcid(ARGS_FREESTRUCT) { free(dhcid->dhcid); } -static inline isc_boolean_t -checkowner_in_dhcid(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_dhcid); - REQUIRE(rdclass == dns_rdataclass_in); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_IN_1_DHCID_49_C */ diff --git a/usr.bin/dig/lib/dns/rdata/in_1/kx_36.c b/usr.bin/dig/lib/dns/rdata/in_1/kx_36.c index 5f248851f2f..8425c6989ee 100644 --- a/usr.bin/dig/lib/dns/rdata/in_1/kx_36.c +++ b/usr.bin/dig/lib/dns/rdata/in_1/kx_36.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: kx_36.c,v 1.4 2020/02/24 12:06:14 florian Exp $ */ +/* $Id: kx_36.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* Reviewed: Thu Mar 16 17:24:54 PST 2000 by explorer */ @@ -156,19 +156,6 @@ freestruct_in_kx(ARGS_FREESTRUCT) { dns_name_free(&kx->exchange); } -static inline isc_boolean_t -checkowner_in_kx(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_kx); - REQUIRE(rdclass == dns_rdataclass_in); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_IN_1_KX_36_C */ diff --git a/usr.bin/dig/lib/dns/rdata/in_1/nsap-ptr_23.c b/usr.bin/dig/lib/dns/rdata/in_1/nsap-ptr_23.c index 58f8d3d783b..d4a719403fe 100644 --- a/usr.bin/dig/lib/dns/rdata/in_1/nsap-ptr_23.c +++ b/usr.bin/dig/lib/dns/rdata/in_1/nsap-ptr_23.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: nsap-ptr_23.c,v 1.4 2020/02/24 12:06:14 florian Exp $ */ +/* $Id: nsap-ptr_23.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* Reviewed: Fri Mar 17 10:16:02 PST 2000 by gson */ @@ -134,19 +134,6 @@ freestruct_in_nsap_ptr(ARGS_FREESTRUCT) { dns_name_free(&nsap_ptr->owner); } -static inline isc_boolean_t -checkowner_in_nsap_ptr(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_nsap_ptr); - REQUIRE(rdclass == dns_rdataclass_in); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_IN_1_NSAP_PTR_23_C */ diff --git a/usr.bin/dig/lib/dns/rdata/in_1/nsap_22.c b/usr.bin/dig/lib/dns/rdata/in_1/nsap_22.c index dc23424fc47..bfd5122eff1 100644 --- a/usr.bin/dig/lib/dns/rdata/in_1/nsap_22.c +++ b/usr.bin/dig/lib/dns/rdata/in_1/nsap_22.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: nsap_22.c,v 1.4 2020/02/24 12:06:14 florian Exp $ */ +/* $Id: nsap_22.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* Reviewed: Fri Mar 17 10:41:07 PST 2000 by gson */ @@ -131,19 +131,6 @@ freestruct_in_nsap(ARGS_FREESTRUCT) { free(nsap->nsap); } -static inline isc_boolean_t -checkowner_in_nsap(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_nsap); - REQUIRE(rdclass == dns_rdataclass_in); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_IN_1_NSAP_22_C */ diff --git a/usr.bin/dig/lib/dns/rdata/in_1/px_26.c b/usr.bin/dig/lib/dns/rdata/in_1/px_26.c index 38dc2beda8b..87acb51e590 100644 --- a/usr.bin/dig/lib/dns/rdata/in_1/px_26.c +++ b/usr.bin/dig/lib/dns/rdata/in_1/px_26.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: px_26.c,v 1.4 2020/02/24 12:06:14 florian Exp $ */ +/* $Id: px_26.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* Reviewed: Mon Mar 20 10:44:27 PST 2000 */ @@ -211,19 +211,6 @@ freestruct_in_px(ARGS_FREESTRUCT) { dns_name_free(&px->mapx400); } -static inline isc_boolean_t -checkowner_in_px(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_px); - REQUIRE(rdclass == dns_rdataclass_in); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_IN_1_PX_26_C */ diff --git a/usr.bin/dig/lib/dns/rdata/in_1/srv_33.c b/usr.bin/dig/lib/dns/rdata/in_1/srv_33.c index 904a7f70573..14730738558 100644 --- a/usr.bin/dig/lib/dns/rdata/in_1/srv_33.c +++ b/usr.bin/dig/lib/dns/rdata/in_1/srv_33.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: srv_33.c,v 1.4 2020/02/24 12:06:14 florian Exp $ */ +/* $Id: srv_33.c,v 1.5 2020/02/24 12:06:51 florian Exp $ */ /* Reviewed: Fri Mar 17 13:01:00 PST 2000 by bwelling */ @@ -194,19 +194,6 @@ freestruct_in_srv(ARGS_FREESTRUCT) { dns_name_free(&srv->target); } -static inline isc_boolean_t -checkowner_in_srv(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_srv); - REQUIRE(rdclass == dns_rdataclass_in); - - UNUSED(name); - UNUSED(type); - UNUSED(rdclass); - UNUSED(wildcard); - - return (ISC_TRUE); -} #endif /* RDATA_IN_1_SRV_33_C */ diff --git a/usr.bin/dig/lib/dns/rdata/in_1/wks_11.c b/usr.bin/dig/lib/dns/rdata/in_1/wks_11.c index 6795d7dc0c4..95f817e48da 100644 --- a/usr.bin/dig/lib/dns/rdata/in_1/wks_11.c +++ b/usr.bin/dig/lib/dns/rdata/in_1/wks_11.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: wks_11.c,v 1.5 2020/02/24 12:06:14 florian Exp $ */ +/* $Id: wks_11.c,v 1.6 2020/02/24 12:06:51 florian Exp $ */ /* Reviewed: Fri Mar 17 15:01:49 PST 2000 by explorer */ @@ -173,17 +173,6 @@ freestruct_in_wks(ARGS_FREESTRUCT) { free(wks->map); } -static inline isc_boolean_t -checkowner_in_wks(ARGS_CHECKOWNER) { - - REQUIRE(type == dns_rdatatype_wks); - REQUIRE(rdclass == dns_rdataclass_in); - - UNUSED(type); - UNUSED(rdclass); - - return (dns_name_ishostname(name, wildcard)); -} #endif /* RDATA_IN_1_WKS_11_C */ |