3142. [bug] NAPTR is class agnostic. [RT #25429]

diff --git a/CHANGES b/CHANGES
index 7f0a7f9617116254489b39dfa9f02c070788f9e0..ee2f3ba0193eea80fec279db4b5d6139e79f8e9c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3142.  [bug]           NAPTR is class agnostic. [RT #25429]
+
 3141.  [bug]           Silence spurious "zone serial (0) unchanged" messages
                        associated with empty zones. [RT #25079]
 

diff --git a/lib/dns/rdata/in_1/naptr_35.c b/lib/dns/rdata/generic/naptr_35.c
similarity index 92%
rename from lib/dns/rdata/in_1/naptr_35.c
rename to lib/dns/rdata/generic/naptr_35.c
index ce7804b277cdf8b9cd9ba00fabff41b9ffd728b6..1dae39475c48f94389161df0673ed1ae52033b4b 100644 (file)
--- a/lib/dns/rdata/in_1/naptr_35.c
+++ b/lib/dns/rdata/generic/naptr_35.c
@@ -15,14 +15,14 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: naptr_35.c,v 1.56 2009/12/04 21:09:34 marka Exp $ */
+/* $Id: naptr_35.c,v 1.1 2011/08/16 00:02:37 marka Exp $ */
 
 /* Reviewed: Thu Mar 16 16:52:50 PST 2000 by bwelling */
 
 /* RFC2915 */
 
-#ifndef RDATA_IN_1_NAPTR_35_C
-#define RDATA_IN_1_NAPTR_35_C
+#ifndef RDATA_GENERIC_NAPTR_35_C
+#define RDATA_GENERIC_NAPTR_35_C
 
 #define RRTYPE_NAPTR_ATTRIBUTES (0)
 #ifdef HAVE_REGEX_H
@@ -148,14 +148,13 @@ txt_valid_regex(const unsigned char *txt) {
 }
 
 static inline isc_result_t
-fromtext_in_naptr(ARGS_FROMTEXT) {
+fromtext_naptr(ARGS_FROMTEXT) {
        isc_token_t token;
        dns_name_t name;
        isc_buffer_t buffer;
        unsigned char *regex;
 
        REQUIRE(type == 35);
-       REQUIRE(rdclass == 1);
 
        UNUSED(type);
        UNUSED(rdclass);
@@ -215,7 +214,7 @@ fromtext_in_naptr(ARGS_FROMTEXT) {
 }
 
 static inline isc_result_t
-totext_in_naptr(ARGS_TOTEXT) {
+totext_naptr(ARGS_TOTEXT) {
        isc_region_t region;
        dns_name_t name;
        dns_name_t prefix;
@@ -224,7 +223,6 @@ totext_in_naptr(ARGS_TOTEXT) {
        unsigned short num;
 
        REQUIRE(rdata->type == 35);
-       REQUIRE(rdata->rdclass == 1);
        REQUIRE(rdata->length != 0);
 
        dns_name_init(&name, NULL);
@@ -277,13 +275,12 @@ totext_in_naptr(ARGS_TOTEXT) {
 }
 
 static inline isc_result_t
-fromwire_in_naptr(ARGS_FROMWIRE) {
+fromwire_naptr(ARGS_FROMWIRE) {
        dns_name_t name;
        isc_region_t sr;
        unsigned char *regex;
 
        REQUIRE(type == 35);
-       REQUIRE(rdclass == 1);
 
        UNUSED(type);
        UNUSED(rdclass);
@@ -325,13 +322,12 @@ fromwire_in_naptr(ARGS_FROMWIRE) {
 }
 
 static inline isc_result_t
-towire_in_naptr(ARGS_TOWIRE) {
+towire_naptr(ARGS_TOWIRE) {
        dns_name_t name;
        dns_offsets_t offsets;
        isc_region_t sr;
 
        REQUIRE(rdata->type == 35);
-       REQUIRE(rdata->rdclass == 1);
        REQUIRE(rdata->length != 0);
 
        dns_compress_setmethods(cctx, DNS_COMPRESS_NONE);
@@ -369,7 +365,7 @@ towire_in_naptr(ARGS_TOWIRE) {
 }
 
 static inline int
-compare_in_naptr(ARGS_COMPARE) {
+compare_naptr(ARGS_COMPARE) {
        dns_name_t name1;
        dns_name_t name2;
        isc_region_t region1;
@@ -379,7 +375,6 @@ compare_in_naptr(ARGS_COMPARE) {
        REQUIRE(rdata1->type == rdata2->type);
        REQUIRE(rdata1->rdclass == rdata2->rdclass);
        REQUIRE(rdata1->type == 35);
-       REQUIRE(rdata1->rdclass == 1);
        REQUIRE(rdata1->length != 0);
        REQUIRE(rdata2->length != 0);
 
@@ -438,12 +433,11 @@ compare_in_naptr(ARGS_COMPARE) {
 }
 
 static inline isc_result_t
-fromstruct_in_naptr(ARGS_FROMSTRUCT) {
-       dns_rdata_in_naptr_t *naptr = source;
+fromstruct_naptr(ARGS_FROMSTRUCT) {
+       dns_rdata_naptr_t *naptr = source;
        isc_region_t region;
 
        REQUIRE(type == 35);
-       REQUIRE(rdclass == 1);
        REQUIRE(source != NULL);
        REQUIRE(naptr->common.rdtype == type);
        REQUIRE(naptr->common.rdclass == rdclass);
@@ -467,14 +461,13 @@ fromstruct_in_naptr(ARGS_FROMSTRUCT) {
 }
 
 static inline isc_result_t
-tostruct_in_naptr(ARGS_TOSTRUCT) {
-       dns_rdata_in_naptr_t *naptr = target;
+tostruct_naptr(ARGS_TOSTRUCT) {
+       dns_rdata_naptr_t *naptr = target;
        isc_region_t r;
        isc_result_t result;
        dns_name_t name;
 
        REQUIRE(rdata->type == 35);
-       REQUIRE(rdata->rdclass == 1);
        REQUIRE(target != NULL);
        REQUIRE(rdata->length != 0);
 
@@ -538,11 +531,10 @@ tostruct_in_naptr(ARGS_TOSTRUCT) {
 }
 
 static inline void
-freestruct_in_naptr(ARGS_FREESTRUCT) {
-       dns_rdata_in_naptr_t *naptr = source;
+freestruct_naptr(ARGS_FREESTRUCT) {
+       dns_rdata_naptr_t *naptr = source;
 
        REQUIRE(source != NULL);
-       REQUIRE(naptr->common.rdclass == 1);
        REQUIRE(naptr->common.rdtype == 35);
 
        if (naptr->mctx == NULL)
@@ -559,7 +551,7 @@ freestruct_in_naptr(ARGS_FREESTRUCT) {
 }
 
 static inline isc_result_t
-additionaldata_in_naptr(ARGS_ADDLDATA) {
+additionaldata_naptr(ARGS_ADDLDATA) {
        dns_name_t name;
        dns_offsets_t offsets;
        isc_region_t sr;
@@ -568,7 +560,6 @@ additionaldata_in_naptr(ARGS_ADDLDATA) {
        char *cp;
 
        REQUIRE(rdata->type == 35);
-       REQUIRE(rdata->rdclass == 1);
 
        /*
         * Order, preference.
@@ -617,14 +608,13 @@ additionaldata_in_naptr(ARGS_ADDLDATA) {
 }
 
 static inline isc_result_t
-digest_in_naptr(ARGS_DIGEST) {
+digest_naptr(ARGS_DIGEST) {
        isc_region_t r1, r2;
        unsigned int length, n;
        isc_result_t result;
        dns_name_t name;
 
        REQUIRE(rdata->type == 35);
-       REQUIRE(rdata->rdclass == 1);
 
        dns_rdata_toregion(rdata, &r1);
        r2 = r1;
@@ -676,10 +666,9 @@ digest_in_naptr(ARGS_DIGEST) {
 }
 
 static inline isc_boolean_t
-checkowner_in_naptr(ARGS_CHECKOWNER) {
+checkowner_naptr(ARGS_CHECKOWNER) {
 
        REQUIRE(type == 35);
-       REQUIRE(rdclass == 1);
 
        UNUSED(name);
        UNUSED(type);
@@ -690,10 +679,9 @@ checkowner_in_naptr(ARGS_CHECKOWNER) {
 }
 
 static inline isc_boolean_t
-checknames_in_naptr(ARGS_CHECKNAMES) {
+checknames_naptr(ARGS_CHECKNAMES) {
 
        REQUIRE(rdata->type == 35);
-       REQUIRE(rdata->rdclass == 1);
 
        UNUSED(rdata);
        UNUSED(owner);
@@ -703,8 +691,8 @@ checknames_in_naptr(ARGS_CHECKNAMES) {
 }
 
 static inline int
-casecompare_in_naptr(ARGS_COMPARE) {
-       return (compare_in_naptr(rdata1, rdata2));
+casecompare_naptr(ARGS_COMPARE) {
+       return (compare_naptr(rdata1, rdata2));
 }
 
-#endif /* RDATA_IN_1_NAPTR_35_C */
+#endif /* RDATA_GENERIC_NAPTR_35_C */

diff --git a/lib/dns/rdata/in_1/naptr_35.h b/lib/dns/rdata/generic/naptr_35.h
similarity index 85%
rename from lib/dns/rdata/in_1/naptr_35.h
rename to lib/dns/rdata/generic/naptr_35.h
index 503f7a8cf527f7e6d03d1fbcc2d54ebeef8ed912..b7fe9e170c4e0a1b102d0e99b0d3df53a5d44b95 100644 (file)
--- a/lib/dns/rdata/in_1/naptr_35.h
+++ b/lib/dns/rdata/generic/naptr_35.h
@@ -15,15 +15,15 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef IN_1_NAPTR_35_H
-#define IN_1_NAPTR_35_H 1
+#ifndef GENERIC_NAPTR_35_H
+#define GENERIC_NAPTR_35_H 1
 
-/* $Id: naptr_35.h,v 1.23 2007/06/19 23:47:17 tbox Exp $ */
+/* $Id: naptr_35.h,v 1.1 2011/08/16 00:02:37 marka Exp $ */
 
 /*! 
  *  \brief Per RFC2915 */
 
-typedef struct dns_rdata_in_naptr {
+typedef struct dns_rdata_naptr {
        dns_rdatacommon_t       common;
        isc_mem_t               *mctx;
        isc_uint16_t            order;
@@ -35,6 +35,6 @@ typedef struct dns_rdata_in_naptr {
        char                    *regexp;
        isc_uint8_t             regexp_len;
        dns_name_t              replacement;
-} dns_rdata_in_naptr_t;
+} dns_rdata_naptr_t;
 
-#endif /* IN_1_NAPTR_35_H */
+#endif /* GENERIC_NAPTR_35_H */

diff --git a/util/copyrights b/util/copyrights
index 67a9f81031ff37749dac527cbbd8dd64d69b0ec1..856f7cbb2144fdf4316da1aeed25e338d5f7362a 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -2308,6 +2308,8 @@
 ./lib/dns/rdata/generic/mr_9.h                 C       1998,1999,2000,2001,2004,2005,2007
 ./lib/dns/rdata/generic/mx_15.c                        C       1998,1999,2000,2001,2003,2004,2005,2007,2009
 ./lib/dns/rdata/generic/mx_15.h                        C       1998,1999,2000,2001,2004,2005,2007
+./lib/dns/rdata/generic/naptr_35.c             C       1999,2000,2001,2003,2004,2005,2007,2008,2009
+./lib/dns/rdata/generic/naptr_35.h             C       1999,2000,2001,2004,2005,2007
 ./lib/dns/rdata/generic/ns_2.c                 C       1998,1999,2000,2001,2004,2007,2009
 ./lib/dns/rdata/generic/ns_2.h                 C       1998,1999,2000,2001,2004,2005,2007
 ./lib/dns/rdata/generic/nsec3_50.c             C       2008,2009,2011
@@ -2364,8 +2366,6 @@
 ./lib/dns/rdata/in_1/dhcid_49.h                        C       2006,2007
 ./lib/dns/rdata/in_1/kx_36.c                   C       1999,2000,2001,2003,2004,2005,2007,2009
 ./lib/dns/rdata/in_1/kx_36.h                   C       1999,2000,2001,2004,2005,2007
-./lib/dns/rdata/in_1/naptr_35.c                        C       1999,2000,2001,2003,2004,2005,2007,2008,2009
-./lib/dns/rdata/in_1/naptr_35.h                        C       1999,2000,2001,2004,2005,2007
 ./lib/dns/rdata/in_1/nsap-ptr_23.c             C       1999,2000,2001,2004,2005,2007,2009
 ./lib/dns/rdata/in_1/nsap-ptr_23.h             C       1999,2000,2001,2004,2005,2007
 ./lib/dns/rdata/in_1/nsap_22.c                 C       1999,2000,2001,2002,2004,2005,2007,2009