From 7c0539bea56022274da04263eb41fbb5b8835c38 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Mon, 15 Feb 1999 05:44:22 +0000
Subject: [PATCH] 	Created dns_name_rdatacompare() to do DNSSEC rdata
 comparisions 	as opposed to DNSSEC owner name comparisions of names. 
 Changed 	all rdata types that were using dns_name_compare() to use 
 dns_name_rdatacompare().

---
 lib/dns/include/dns/name.h       | 20 +++++++++
 lib/dns/name.c                   | 72 ++++++++++++++++++++++++++++++++
 lib/dns/rdata/any_255/tsig_250.c |  4 +-
 lib/dns/rdata/any_255/tsig_250.h |  4 +-
 lib/dns/rdata/generic/afsdb_18.c |  4 +-
 lib/dns/rdata/generic/afsdb_18.h |  4 +-
 lib/dns/rdata/generic/cname_5.c  |  4 +-
 lib/dns/rdata/generic/cname_5.h  |  4 +-
 lib/dns/rdata/generic/dname_39.c |  4 +-
 lib/dns/rdata/generic/dname_39.h |  4 +-
 lib/dns/rdata/generic/mb_7.c     |  4 +-
 lib/dns/rdata/generic/mb_7.h     |  4 +-
 lib/dns/rdata/generic/md_3.c     |  4 +-
 lib/dns/rdata/generic/md_3.h     |  4 +-
 lib/dns/rdata/generic/mf_4.c     |  4 +-
 lib/dns/rdata/generic/mf_4.h     |  4 +-
 lib/dns/rdata/generic/mg_8.c     |  4 +-
 lib/dns/rdata/generic/mg_8.h     |  4 +-
 lib/dns/rdata/generic/minfo_14.c |  6 +--
 lib/dns/rdata/generic/minfo_14.h |  6 +--
 lib/dns/rdata/generic/mr_9.c     |  4 +-
 lib/dns/rdata/generic/mr_9.h     |  4 +-
 lib/dns/rdata/generic/mx_15.c    |  4 +-
 lib/dns/rdata/generic/mx_15.h    |  4 +-
 lib/dns/rdata/generic/ns_2.c     |  4 +-
 lib/dns/rdata/generic/ns_2.h     |  4 +-
 lib/dns/rdata/generic/nxt_30.c   |  4 +-
 lib/dns/rdata/generic/nxt_30.h   |  4 +-
 lib/dns/rdata/generic/ptr_12.c   |  4 +-
 lib/dns/rdata/generic/ptr_12.h   |  4 +-
 lib/dns/rdata/generic/rp_17.c    |  6 +--
 lib/dns/rdata/generic/rp_17.h    |  6 +--
 lib/dns/rdata/generic/rt_21.c    |  4 +-
 lib/dns/rdata/generic/rt_21.h    |  4 +-
 lib/dns/rdata/generic/sig_24.c   |  4 +-
 lib/dns/rdata/generic/sig_24.h   |  4 +-
 lib/dns/rdata/generic/soa_6.c    |  6 +--
 lib/dns/rdata/generic/soa_6.h    |  6 +--
 lib/dns/rdata/generic/tkey_249.c |  4 +-
 lib/dns/rdata/generic/tkey_249.h |  4 +-
 lib/dns/rdata/in_1/a6_38.c       |  4 +-
 lib/dns/rdata/in_1/a6_38.h       |  4 +-
 lib/dns/rdata/in_1/kx_36.c       |  4 +-
 lib/dns/rdata/in_1/kx_36.h       |  4 +-
 lib/dns/rdata/in_1/naptr_35.c    |  4 +-
 lib/dns/rdata/in_1/naptr_35.h    |  4 +-
 lib/dns/rdata/in_1/nsap-ptr_23.c |  4 +-
 lib/dns/rdata/in_1/nsap-ptr_23.h |  4 +-
 lib/dns/rdata/in_1/px_26.c       |  6 +--
 lib/dns/rdata/in_1/px_26.h       |  6 +--
 lib/dns/rdata/in_1/srv_33.c      |  4 +-
 lib/dns/rdata/in_1/srv_33.h      |  4 +-
 52 files changed, 200 insertions(+), 108 deletions(-)

diff --git a/lib/dns/include/dns/name.h b/lib/dns/include/dns/name.h
index 00c016f190..5b218e0fbd 100644
--- a/lib/dns/include/dns/name.h
+++ b/lib/dns/include/dns/name.h
@@ -286,6 +286,26 @@ dns_name_compare(dns_name_t *name1, dns_name_t *name2);
  *	1		'name1' is greater than 'name2'
  */
 
+int
+dns_name_rdatacompare(dns_name_t *name1, dns_name_t *name2);
+/*
+ * Compare two names as if they are part of rdata. 
+ *
+ * Requires:
+ *	'name1' is a valid absolute name
+ *
+ *	dns_name_countlabels(name1) > 0
+ *
+ *	'name2' is a valid absolute name
+ *
+ *	dns_name_countlabels(name2) > 0
+ *
+ * Returns:
+ *	-1		'name1' is less than 'name2'
+ *	0		'name1' is equal to 'name2'
+ *	1		'name1' is greater than 'name2'
+ */
+
 isc_boolean_t
 dns_name_issubdomain(dns_name_t *name1, dns_name_t *name2);
 /*
diff --git a/lib/dns/name.c b/lib/dns/name.c
index 549a45d613..1f8c5e32d5 100644
--- a/lib/dns/name.c
+++ b/lib/dns/name.c
@@ -456,6 +456,78 @@ dns_name_compare(dns_name_t *name1, dns_name_t *name2) {
 	return (ldiff);
 }
 
+int
+dns_name_rdatacompare(dns_name_t *name1, dns_name_t *name2) {
+	unsigned int l1, l2, l, count1, count2, count;
+	unsigned char c1, c2;
+	unsigned char *label1, *label2;
+
+	/*
+	 * Compare two absolute names as rdata.
+	 */
+
+	REQUIRE(VALID_NAME(name1));
+	REQUIRE(name1->labels > 0);
+	REQUIRE((name1->attributes & DNS_NAMEATTR_ABSOLUTE) != 0);
+	REQUIRE(VALID_NAME(name2));
+	REQUIRE(name2->labels > 0);
+	REQUIRE((name2->attributes & DNS_NAMEATTR_ABSOLUTE) != 0);
+
+	l1 = name1->labels;
+	l2 = name2->labels;
+
+	l = (l1 < l2) ? l1 : l2;
+
+	label1 = name1->ndata;
+	label2 = name2->ndata;
+	while (l > 0) {
+		l--;
+		count1 = *label1++;
+		count2 = *label2++;
+		if (count1 <= 63 && count2 <= 63) {
+			if (count1 != count2)
+				return ((count1 < count2) ? -1 : 1);
+			count = count1;
+			while (count > 0) {
+				count--;
+				c1 = maptolower[*label1++];
+				c2 = maptolower[*label2++];
+				if (c1 < c2)
+					return (-1);
+				else if (c1 > c2)
+					return (1);
+			}
+		} else if (count1 == DNS_LABELTYPE_BITSTRING && count2 <= 63) {
+			return (1);
+		} else if (count2 == DNS_LABELTYPE_BITSTRING && count1 <= 63) {
+			return (-1);
+		} else {
+			INSIST(count1 == DNS_LABELTYPE_BITSTRING &&
+			       count2 == DNS_LABELTYPE_BITSTRING);
+			count2 = *label2++;
+			count1 = *label1++;
+			if (count1 != count2)
+				return ((count1 < count2) ? -1 : 1);
+			if (count1 == 0)
+				count1 = 256;
+			if (count2 == 0)
+				count2 = 256;
+			/* number of bytes */
+			count = (count1 + 7) / 8;
+			while (count > 0) {
+				c1 = *label1++;
+				c2 = *label2++;
+				if (c1 != c2)
+					return ((c1 < c2) ? -1 : 1);
+			}
+		}
+	}
+
+	INSIST(l1 == l2);
+
+	return (0);
+}
+
 isc_boolean_t
 dns_name_issubdomain(dns_name_t *name1, dns_name_t *name2) {
 	unsigned int l1, l2, count1, count2;
diff --git a/lib/dns/rdata/any_255/tsig_250.c b/lib/dns/rdata/any_255/tsig_250.c
index 4e7c8dd35a..975881955b 100644
--- a/lib/dns/rdata/any_255/tsig_250.c
+++ b/lib/dns/rdata/any_255/tsig_250.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: tsig_250.c,v 1.3 1999/02/05 05:15:15 marka Exp $ */
+ /* $Id: tsig_250.c,v 1.4 1999/02/15 05:44:15 marka Exp $ */
 
  /* draft-ietf-dnsind-tsig-07.txt */
 
@@ -263,7 +263,7 @@ compare_any_tsig(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_init(&name2, NULL);
 	dns_name_fromregion(&name1, &r1);
 	dns_name_fromregion(&name2, &r2);
-	result = dns_name_compare(&name1, &name2);
+	result = dns_name_rdatacompare(&name1, &name2);
 	if (result != 0)
 		return (result);
 	isc_region_consume(&r1, name_length(&name1));
diff --git a/lib/dns/rdata/any_255/tsig_250.h b/lib/dns/rdata/any_255/tsig_250.h
index 0cadda8728..b233dfe18a 100644
--- a/lib/dns/rdata/any_255/tsig_250.h
+++ b/lib/dns/rdata/any_255/tsig_250.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: tsig_250.h,v 1.3 1999/02/05 05:15:15 marka Exp $ */
+ /* $Id: tsig_250.h,v 1.4 1999/02/15 05:44:15 marka Exp $ */
 
  /* draft-ietf-dnsind-tsig-07.txt */
 
@@ -263,7 +263,7 @@ compare_any_tsig(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_init(&name2, NULL);
 	dns_name_fromregion(&name1, &r1);
 	dns_name_fromregion(&name2, &r2);
-	result = dns_name_compare(&name1, &name2);
+	result = dns_name_rdatacompare(&name1, &name2);
 	if (result != 0)
 		return (result);
 	isc_region_consume(&r1, name_length(&name1));
diff --git a/lib/dns/rdata/generic/afsdb_18.c b/lib/dns/rdata/generic/afsdb_18.c
index 310820c49d..d1cb2f480b 100644
--- a/lib/dns/rdata/generic/afsdb_18.c
+++ b/lib/dns/rdata/generic/afsdb_18.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: afsdb_18.c,v 1.1 1999/01/22 05:02:44 marka Exp $ */
+ /* $Id: afsdb_18.c,v 1.2 1999/02/15 05:44:15 marka Exp $ */
 
  /* RFC 1183 */
 
@@ -148,7 +148,7 @@ compare_afsdb(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	return (dns_name_compare(&name1, &name2));
+	return (dns_name_rdatacompare(&name1, &name2));
 }
 
 static dns_result_t
diff --git a/lib/dns/rdata/generic/afsdb_18.h b/lib/dns/rdata/generic/afsdb_18.h
index 479615d940..84a3fc9c64 100644
--- a/lib/dns/rdata/generic/afsdb_18.h
+++ b/lib/dns/rdata/generic/afsdb_18.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: afsdb_18.h,v 1.1 1999/01/22 05:02:44 marka Exp $ */
+ /* $Id: afsdb_18.h,v 1.2 1999/02/15 05:44:15 marka Exp $ */
 
  /* RFC 1183 */
 
@@ -148,7 +148,7 @@ compare_afsdb(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	return (dns_name_compare(&name1, &name2));
+	return (dns_name_rdatacompare(&name1, &name2));
 }
 
 static dns_result_t
diff --git a/lib/dns/rdata/generic/cname_5.c b/lib/dns/rdata/generic/cname_5.c
index cf204c8428..1fc75f9893 100644
--- a/lib/dns/rdata/generic/cname_5.c
+++ b/lib/dns/rdata/generic/cname_5.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: cname_5.c,v 1.6 1999/01/22 05:02:44 marka Exp $ */
+ /* $Id: cname_5.c,v 1.7 1999/02/15 05:44:16 marka Exp $ */
 
 #ifndef RDATA_GENERIC_CNAME_5_H
 #define RDATA_GENERIC_CNAME_5_H
@@ -107,7 +107,7 @@ compare_cname(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	return (dns_name_compare(&name1, &name2));
+	return (dns_name_rdatacompare(&name1, &name2));
 }
 
 static dns_result_t
diff --git a/lib/dns/rdata/generic/cname_5.h b/lib/dns/rdata/generic/cname_5.h
index 76cd5e4fc2..caf5285c11 100644
--- a/lib/dns/rdata/generic/cname_5.h
+++ b/lib/dns/rdata/generic/cname_5.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: cname_5.h,v 1.6 1999/01/22 05:02:44 marka Exp $ */
+ /* $Id: cname_5.h,v 1.7 1999/02/15 05:44:16 marka Exp $ */
 
 #ifndef RDATA_GENERIC_CNAME_5_H
 #define RDATA_GENERIC_CNAME_5_H
@@ -107,7 +107,7 @@ compare_cname(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	return (dns_name_compare(&name1, &name2));
+	return (dns_name_rdatacompare(&name1, &name2));
 }
 
 static dns_result_t
diff --git a/lib/dns/rdata/generic/dname_39.c b/lib/dns/rdata/generic/dname_39.c
index 2bf03e2587..1e8c3a13ea 100644
--- a/lib/dns/rdata/generic/dname_39.c
+++ b/lib/dns/rdata/generic/dname_39.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: dname_39.c,v 1.1 1999/02/02 05:03:10 marka Exp $ */
+ /* $Id: dname_39.c,v 1.2 1999/02/15 05:44:16 marka Exp $ */
 
  /* draft-ietf-dnsind-dname-02.txt */
 
@@ -111,7 +111,7 @@ compare_dname(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	return (dns_name_compare(&name1, &name2));
+	return (dns_name_rdatacompare(&name1, &name2));
 }
 
 static dns_result_t
diff --git a/lib/dns/rdata/generic/dname_39.h b/lib/dns/rdata/generic/dname_39.h
index 6c0797f5b8..3433400166 100644
--- a/lib/dns/rdata/generic/dname_39.h
+++ b/lib/dns/rdata/generic/dname_39.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: dname_39.h,v 1.1 1999/02/02 05:03:10 marka Exp $ */
+ /* $Id: dname_39.h,v 1.2 1999/02/15 05:44:16 marka Exp $ */
 
  /* draft-ietf-dnsind-dname-02.txt */
 
@@ -111,7 +111,7 @@ compare_dname(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	return (dns_name_compare(&name1, &name2));
+	return (dns_name_rdatacompare(&name1, &name2));
 }
 
 static dns_result_t
diff --git a/lib/dns/rdata/generic/mb_7.c b/lib/dns/rdata/generic/mb_7.c
index a74f0cbd9f..6c62e5e4b9 100644
--- a/lib/dns/rdata/generic/mb_7.c
+++ b/lib/dns/rdata/generic/mb_7.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: mb_7.c,v 1.6 1999/01/22 05:02:45 marka Exp $ */
+ /* $Id: mb_7.c,v 1.7 1999/02/15 05:44:16 marka Exp $ */
 
 #ifndef RDATA_GENERIC_MB_7_H
 #define RDATA_GENERIC_MB_7_H
@@ -109,7 +109,7 @@ compare_mb(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	return (dns_name_compare(&name1, &name2));
+	return (dns_name_rdatacompare(&name1, &name2));
 }
 
 static dns_result_t
diff --git a/lib/dns/rdata/generic/mb_7.h b/lib/dns/rdata/generic/mb_7.h
index 05ee992f2c..4e376b79fc 100644
--- a/lib/dns/rdata/generic/mb_7.h
+++ b/lib/dns/rdata/generic/mb_7.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: mb_7.h,v 1.6 1999/01/22 05:02:45 marka Exp $ */
+ /* $Id: mb_7.h,v 1.7 1999/02/15 05:44:16 marka Exp $ */
 
 #ifndef RDATA_GENERIC_MB_7_H
 #define RDATA_GENERIC_MB_7_H
@@ -109,7 +109,7 @@ compare_mb(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	return (dns_name_compare(&name1, &name2));
+	return (dns_name_rdatacompare(&name1, &name2));
 }
 
 static dns_result_t
diff --git a/lib/dns/rdata/generic/md_3.c b/lib/dns/rdata/generic/md_3.c
index 2b3064fc1e..c40d9906f9 100644
--- a/lib/dns/rdata/generic/md_3.c
+++ b/lib/dns/rdata/generic/md_3.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: md_3.c,v 1.6 1999/01/22 05:02:45 marka Exp $ */
+ /* $Id: md_3.c,v 1.7 1999/02/15 05:44:16 marka Exp $ */
 
 #ifndef RDATA_GENERIC_MD_3_H
 #define RDATA_GENERIC_MD_3_H
@@ -107,7 +107,7 @@ compare_md(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	return (dns_name_compare(&name1, &name2));
+	return (dns_name_rdatacompare(&name1, &name2));
 }
 
 static dns_result_t
diff --git a/lib/dns/rdata/generic/md_3.h b/lib/dns/rdata/generic/md_3.h
index 6b95dafa15..0fe24f8118 100644
--- a/lib/dns/rdata/generic/md_3.h
+++ b/lib/dns/rdata/generic/md_3.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: md_3.h,v 1.6 1999/01/22 05:02:45 marka Exp $ */
+ /* $Id: md_3.h,v 1.7 1999/02/15 05:44:16 marka Exp $ */
 
 #ifndef RDATA_GENERIC_MD_3_H
 #define RDATA_GENERIC_MD_3_H
@@ -107,7 +107,7 @@ compare_md(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	return (dns_name_compare(&name1, &name2));
+	return (dns_name_rdatacompare(&name1, &name2));
 }
 
 static dns_result_t
diff --git a/lib/dns/rdata/generic/mf_4.c b/lib/dns/rdata/generic/mf_4.c
index a7e4a8f737..1e773936eb 100644
--- a/lib/dns/rdata/generic/mf_4.c
+++ b/lib/dns/rdata/generic/mf_4.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: mf_4.c,v 1.6 1999/01/22 05:02:45 marka Exp $ */
+ /* $Id: mf_4.c,v 1.7 1999/02/15 05:44:17 marka Exp $ */
 
 #ifndef RDATA_GENERIC_MF_4_H
 #define RDATA_GENERIC_MF_4_H
@@ -107,7 +107,7 @@ compare_mf(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	return (dns_name_compare(&name1, &name2));
+	return (dns_name_rdatacompare(&name1, &name2));
 }
 
 static dns_result_t
diff --git a/lib/dns/rdata/generic/mf_4.h b/lib/dns/rdata/generic/mf_4.h
index 66817c0b2b..c8b6dcfad0 100644
--- a/lib/dns/rdata/generic/mf_4.h
+++ b/lib/dns/rdata/generic/mf_4.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: mf_4.h,v 1.6 1999/01/22 05:02:45 marka Exp $ */
+ /* $Id: mf_4.h,v 1.7 1999/02/15 05:44:17 marka Exp $ */
 
 #ifndef RDATA_GENERIC_MF_4_H
 #define RDATA_GENERIC_MF_4_H
@@ -107,7 +107,7 @@ compare_mf(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	return (dns_name_compare(&name1, &name2));
+	return (dns_name_rdatacompare(&name1, &name2));
 }
 
 static dns_result_t
diff --git a/lib/dns/rdata/generic/mg_8.c b/lib/dns/rdata/generic/mg_8.c
index e905aa0118..62bd188555 100644
--- a/lib/dns/rdata/generic/mg_8.c
+++ b/lib/dns/rdata/generic/mg_8.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: mg_8.c,v 1.6 1999/01/22 05:02:45 marka Exp $ */
+ /* $Id: mg_8.c,v 1.7 1999/02/15 05:44:17 marka Exp $ */
 
 #ifndef RDATA_GENERIC_MG_8_H
 #define RDATA_GENERIC_MG_8_H
@@ -109,7 +109,7 @@ compare_mg(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	return (dns_name_compare(&name1, &name2));
+	return (dns_name_rdatacompare(&name1, &name2));
 }
 
 static dns_result_t
diff --git a/lib/dns/rdata/generic/mg_8.h b/lib/dns/rdata/generic/mg_8.h
index fdfd302154..84ad1bad81 100644
--- a/lib/dns/rdata/generic/mg_8.h
+++ b/lib/dns/rdata/generic/mg_8.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: mg_8.h,v 1.6 1999/01/22 05:02:45 marka Exp $ */
+ /* $Id: mg_8.h,v 1.7 1999/02/15 05:44:17 marka Exp $ */
 
 #ifndef RDATA_GENERIC_MG_8_H
 #define RDATA_GENERIC_MG_8_H
@@ -109,7 +109,7 @@ compare_mg(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	return (dns_name_compare(&name1, &name2));
+	return (dns_name_rdatacompare(&name1, &name2));
 }
 
 static dns_result_t
diff --git a/lib/dns/rdata/generic/minfo_14.c b/lib/dns/rdata/generic/minfo_14.c
index 5e5d4706aa..c8e25ecc3d 100644
--- a/lib/dns/rdata/generic/minfo_14.c
+++ b/lib/dns/rdata/generic/minfo_14.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: minfo_14.c,v 1.7 1999/01/27 13:38:20 marka Exp $ */
+ /* $Id: minfo_14.c,v 1.8 1999/02/15 05:44:17 marka Exp $ */
 
 #ifndef RDATA_GENERIC_MINFO_14_H
 #define RDATA_GENERIC_MINFO_14_H
@@ -141,7 +141,7 @@ compare_minfo(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	result = dns_name_compare(&name1, &name2);
+	result = dns_name_rdatacompare(&name1, &name2);
 	if (result != 0)
 		return (result);
 
@@ -154,7 +154,7 @@ compare_minfo(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	result = dns_name_compare(&name1, &name2);
+	result = dns_name_rdatacompare(&name1, &name2);
 	return (result);
 }
 
diff --git a/lib/dns/rdata/generic/minfo_14.h b/lib/dns/rdata/generic/minfo_14.h
index 7b7d2e38a5..3fb859fa71 100644
--- a/lib/dns/rdata/generic/minfo_14.h
+++ b/lib/dns/rdata/generic/minfo_14.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: minfo_14.h,v 1.7 1999/01/27 13:38:20 marka Exp $ */
+ /* $Id: minfo_14.h,v 1.8 1999/02/15 05:44:17 marka Exp $ */
 
 #ifndef RDATA_GENERIC_MINFO_14_H
 #define RDATA_GENERIC_MINFO_14_H
@@ -141,7 +141,7 @@ compare_minfo(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	result = dns_name_compare(&name1, &name2);
+	result = dns_name_rdatacompare(&name1, &name2);
 	if (result != 0)
 		return (result);
 
@@ -154,7 +154,7 @@ compare_minfo(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	result = dns_name_compare(&name1, &name2);
+	result = dns_name_rdatacompare(&name1, &name2);
 	return (result);
 }
 
diff --git a/lib/dns/rdata/generic/mr_9.c b/lib/dns/rdata/generic/mr_9.c
index 4e5b1dbc7d..4e8033f3bb 100644
--- a/lib/dns/rdata/generic/mr_9.c
+++ b/lib/dns/rdata/generic/mr_9.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: mr_9.c,v 1.6 1999/01/22 05:02:46 marka Exp $ */
+ /* $Id: mr_9.c,v 1.7 1999/02/15 05:44:18 marka Exp $ */
 
 #ifndef RDATA_GENERIC_MR_9_H
 #define RDATA_GENERIC_MR_9_H
@@ -109,7 +109,7 @@ compare_mr(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	return (dns_name_compare(&name1, &name2));
+	return (dns_name_rdatacompare(&name1, &name2));
 }
 
 static dns_result_t
diff --git a/lib/dns/rdata/generic/mr_9.h b/lib/dns/rdata/generic/mr_9.h
index 790760a870..b50dbbb0ea 100644
--- a/lib/dns/rdata/generic/mr_9.h
+++ b/lib/dns/rdata/generic/mr_9.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: mr_9.h,v 1.6 1999/01/22 05:02:46 marka Exp $ */
+ /* $Id: mr_9.h,v 1.7 1999/02/15 05:44:18 marka Exp $ */
 
 #ifndef RDATA_GENERIC_MR_9_H
 #define RDATA_GENERIC_MR_9_H
@@ -109,7 +109,7 @@ compare_mr(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	return (dns_name_compare(&name1, &name2));
+	return (dns_name_rdatacompare(&name1, &name2));
 }
 
 static dns_result_t
diff --git a/lib/dns/rdata/generic/mx_15.c b/lib/dns/rdata/generic/mx_15.c
index be9169f9fd..891ad9383c 100644
--- a/lib/dns/rdata/generic/mx_15.c
+++ b/lib/dns/rdata/generic/mx_15.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: mx_15.c,v 1.9 1999/01/22 05:02:46 marka Exp $ */
+ /* $Id: mx_15.c,v 1.10 1999/02/15 05:44:18 marka Exp $ */
 
 #ifndef RDATA_GENERIC_MX_15_H
 #define RDATA_GENERIC_MX_15_H
@@ -145,7 +145,7 @@ compare_mx(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	return (dns_name_compare(&name1, &name2));
+	return (dns_name_rdatacompare(&name1, &name2));
 }
 
 static dns_result_t
diff --git a/lib/dns/rdata/generic/mx_15.h b/lib/dns/rdata/generic/mx_15.h
index 0fe5bf78c3..a51b7ddab2 100644
--- a/lib/dns/rdata/generic/mx_15.h
+++ b/lib/dns/rdata/generic/mx_15.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: mx_15.h,v 1.9 1999/01/22 05:02:46 marka Exp $ */
+ /* $Id: mx_15.h,v 1.10 1999/02/15 05:44:18 marka Exp $ */
 
 #ifndef RDATA_GENERIC_MX_15_H
 #define RDATA_GENERIC_MX_15_H
@@ -145,7 +145,7 @@ compare_mx(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	return (dns_name_compare(&name1, &name2));
+	return (dns_name_rdatacompare(&name1, &name2));
 }
 
 static dns_result_t
diff --git a/lib/dns/rdata/generic/ns_2.c b/lib/dns/rdata/generic/ns_2.c
index 78ce27373c..571c5d2ea2 100644
--- a/lib/dns/rdata/generic/ns_2.c
+++ b/lib/dns/rdata/generic/ns_2.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: ns_2.c,v 1.6 1999/01/22 05:02:46 marka Exp $ */
+ /* $Id: ns_2.c,v 1.7 1999/02/15 05:44:18 marka Exp $ */
 
 #ifndef RDATA_GENERIC_NS_2_H
 #define RDATA_GENERIC_NS_2_H
@@ -109,7 +109,7 @@ compare_ns(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	return (dns_name_compare(&name1, &name2));
+	return (dns_name_rdatacompare(&name1, &name2));
 }
 
 static dns_result_t
diff --git a/lib/dns/rdata/generic/ns_2.h b/lib/dns/rdata/generic/ns_2.h
index 950fd8de04..2bde159d3e 100644
--- a/lib/dns/rdata/generic/ns_2.h
+++ b/lib/dns/rdata/generic/ns_2.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: ns_2.h,v 1.6 1999/01/22 05:02:46 marka Exp $ */
+ /* $Id: ns_2.h,v 1.7 1999/02/15 05:44:18 marka Exp $ */
 
 #ifndef RDATA_GENERIC_NS_2_H
 #define RDATA_GENERIC_NS_2_H
@@ -109,7 +109,7 @@ compare_ns(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	return (dns_name_compare(&name1, &name2));
+	return (dns_name_rdatacompare(&name1, &name2));
 }
 
 static dns_result_t
diff --git a/lib/dns/rdata/generic/nxt_30.c b/lib/dns/rdata/generic/nxt_30.c
index ff3782540d..cfcc3ae3a1 100644
--- a/lib/dns/rdata/generic/nxt_30.c
+++ b/lib/dns/rdata/generic/nxt_30.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: nxt_30.c,v 1.3 1999/02/04 06:38:43 marka Exp $ */
+ /* $Id: nxt_30.c,v 1.4 1999/02/15 05:44:18 marka Exp $ */
 
  /* RFC 2065 */
 
@@ -171,7 +171,7 @@ compare_nxt(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_rdata_toregion(rdata2, &r2);
 	dns_name_fromregion(&name1, &r1);
 	dns_name_fromregion(&name2, &r2);
-	result = dns_name_compare(&name1, &name2);
+	result = dns_name_rdatacompare(&name1, &name2);
 	if (result != 0)
 		return (result);
 
diff --git a/lib/dns/rdata/generic/nxt_30.h b/lib/dns/rdata/generic/nxt_30.h
index 7322ebd30b..4ed00dba60 100644
--- a/lib/dns/rdata/generic/nxt_30.h
+++ b/lib/dns/rdata/generic/nxt_30.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: nxt_30.h,v 1.3 1999/02/04 06:38:43 marka Exp $ */
+ /* $Id: nxt_30.h,v 1.4 1999/02/15 05:44:18 marka Exp $ */
 
  /* RFC 2065 */
 
@@ -171,7 +171,7 @@ compare_nxt(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_rdata_toregion(rdata2, &r2);
 	dns_name_fromregion(&name1, &r1);
 	dns_name_fromregion(&name2, &r2);
-	result = dns_name_compare(&name1, &name2);
+	result = dns_name_rdatacompare(&name1, &name2);
 	if (result != 0)
 		return (result);
 
diff --git a/lib/dns/rdata/generic/ptr_12.c b/lib/dns/rdata/generic/ptr_12.c
index 9eda56cdf1..e9a686e484 100644
--- a/lib/dns/rdata/generic/ptr_12.c
+++ b/lib/dns/rdata/generic/ptr_12.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: ptr_12.c,v 1.6 1999/01/22 05:02:47 marka Exp $ */
+ /* $Id: ptr_12.c,v 1.7 1999/02/15 05:44:19 marka Exp $ */
 
 #ifndef RDATA_GENERIC_PTR_12_H
 #define RDATA_GENERIC_PTR_12_H
@@ -109,7 +109,7 @@ compare_ptr(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	return (dns_name_compare(&name1, &name2));
+	return (dns_name_rdatacompare(&name1, &name2));
 }
 
 static dns_result_t
diff --git a/lib/dns/rdata/generic/ptr_12.h b/lib/dns/rdata/generic/ptr_12.h
index 32d06e17bc..7b38172a49 100644
--- a/lib/dns/rdata/generic/ptr_12.h
+++ b/lib/dns/rdata/generic/ptr_12.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: ptr_12.h,v 1.6 1999/01/22 05:02:47 marka Exp $ */
+ /* $Id: ptr_12.h,v 1.7 1999/02/15 05:44:19 marka Exp $ */
 
 #ifndef RDATA_GENERIC_PTR_12_H
 #define RDATA_GENERIC_PTR_12_H
@@ -109,7 +109,7 @@ compare_ptr(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	return (dns_name_compare(&name1, &name2));
+	return (dns_name_rdatacompare(&name1, &name2));
 }
 
 static dns_result_t
diff --git a/lib/dns/rdata/generic/rp_17.c b/lib/dns/rdata/generic/rp_17.c
index bc6a201266..761879fd25 100644
--- a/lib/dns/rdata/generic/rp_17.c
+++ b/lib/dns/rdata/generic/rp_17.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: rp_17.c,v 1.1 1999/01/22 05:02:47 marka Exp $ */
+ /* $Id: rp_17.c,v 1.2 1999/02/15 05:44:19 marka Exp $ */
 
  /* RFC 1183 */
 
@@ -143,7 +143,7 @@ compare_rp(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	result = dns_name_compare(&name1, &name2);
+	result = dns_name_rdatacompare(&name1, &name2);
 	if (result != 0)
 		return (result);
 
@@ -156,7 +156,7 @@ compare_rp(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	result = dns_name_compare(&name1, &name2);
+	result = dns_name_rdatacompare(&name1, &name2);
 	return (result);
 }
 
diff --git a/lib/dns/rdata/generic/rp_17.h b/lib/dns/rdata/generic/rp_17.h
index 2d62fffb4d..92e36122d8 100644
--- a/lib/dns/rdata/generic/rp_17.h
+++ b/lib/dns/rdata/generic/rp_17.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: rp_17.h,v 1.1 1999/01/22 05:02:47 marka Exp $ */
+ /* $Id: rp_17.h,v 1.2 1999/02/15 05:44:19 marka Exp $ */
 
  /* RFC 1183 */
 
@@ -143,7 +143,7 @@ compare_rp(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	result = dns_name_compare(&name1, &name2);
+	result = dns_name_rdatacompare(&name1, &name2);
 	if (result != 0)
 		return (result);
 
@@ -156,7 +156,7 @@ compare_rp(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	result = dns_name_compare(&name1, &name2);
+	result = dns_name_rdatacompare(&name1, &name2);
 	return (result);
 }
 
diff --git a/lib/dns/rdata/generic/rt_21.c b/lib/dns/rdata/generic/rt_21.c
index 21316a6f83..80c773c930 100644
--- a/lib/dns/rdata/generic/rt_21.c
+++ b/lib/dns/rdata/generic/rt_21.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: rt_21.c,v 1.1 1999/01/22 05:02:48 marka Exp $ */
+ /* $Id: rt_21.c,v 1.2 1999/02/15 05:44:19 marka Exp $ */
 
  /* RFC 1183 */
 
@@ -147,7 +147,7 @@ compare_rt(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	return (dns_name_compare(&name1, &name2));
+	return (dns_name_rdatacompare(&name1, &name2));
 }
 
 static dns_result_t
diff --git a/lib/dns/rdata/generic/rt_21.h b/lib/dns/rdata/generic/rt_21.h
index 33f8a9f571..78fa4a53f3 100644
--- a/lib/dns/rdata/generic/rt_21.h
+++ b/lib/dns/rdata/generic/rt_21.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: rt_21.h,v 1.1 1999/01/22 05:02:48 marka Exp $ */
+ /* $Id: rt_21.h,v 1.2 1999/02/15 05:44:19 marka Exp $ */
 
  /* RFC 1183 */
 
@@ -147,7 +147,7 @@ compare_rt(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	return (dns_name_compare(&name1, &name2));
+	return (dns_name_rdatacompare(&name1, &name2));
 }
 
 static dns_result_t
diff --git a/lib/dns/rdata/generic/sig_24.c b/lib/dns/rdata/generic/sig_24.c
index 4495122182..2918938734 100644
--- a/lib/dns/rdata/generic/sig_24.c
+++ b/lib/dns/rdata/generic/sig_24.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: sig_24.c,v 1.5 1999/02/04 00:03:29 marka Exp $ */
+ /* $Id: sig_24.c,v 1.6 1999/02/15 05:44:20 marka Exp $ */
 
  /* RFC 2065 */
 
@@ -268,7 +268,7 @@ compare_sig(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	isc_region_consume(&r2, 18);
 	dns_name_fromregion(&name1, &r1);
 	dns_name_fromregion(&name2, &r2);
-	result = dns_name_compare(&name1, &name2);
+	result = dns_name_rdatacompare(&name1, &name2);
 	if (result != 0)
 		return (result);
 	isc_region_consume(&r1, name_length(&name1));
diff --git a/lib/dns/rdata/generic/sig_24.h b/lib/dns/rdata/generic/sig_24.h
index 052e8c6bd1..34a81308ea 100644
--- a/lib/dns/rdata/generic/sig_24.h
+++ b/lib/dns/rdata/generic/sig_24.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: sig_24.h,v 1.5 1999/02/04 00:03:29 marka Exp $ */
+ /* $Id: sig_24.h,v 1.6 1999/02/15 05:44:20 marka Exp $ */
 
  /* RFC 2065 */
 
@@ -268,7 +268,7 @@ compare_sig(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	isc_region_consume(&r2, 18);
 	dns_name_fromregion(&name1, &r1);
 	dns_name_fromregion(&name2, &r2);
-	result = dns_name_compare(&name1, &name2);
+	result = dns_name_rdatacompare(&name1, &name2);
 	if (result != 0)
 		return (result);
 	isc_region_consume(&r1, name_length(&name1));
diff --git a/lib/dns/rdata/generic/soa_6.c b/lib/dns/rdata/generic/soa_6.c
index 15f4068d7d..2923241aa9 100644
--- a/lib/dns/rdata/generic/soa_6.c
+++ b/lib/dns/rdata/generic/soa_6.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: soa_6.c,v 1.9 1999/01/22 05:02:48 marka Exp $ */
+ /* $Id: soa_6.c,v 1.10 1999/02/15 05:44:20 marka Exp $ */
 
 #ifndef RDATA_GENERIC_SOA_6_H
 #define RDATA_GENERIC_SOA_6_H
@@ -182,7 +182,7 @@ compare_soa(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	result = dns_name_compare(&name1, &name2);
+	result = dns_name_rdatacompare(&name1, &name2);
 	if (result != 0)
 		return (result);
 
@@ -195,7 +195,7 @@ compare_soa(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	result = dns_name_compare(&name1, &name2);
+	result = dns_name_rdatacompare(&name1, &name2);
 	if (result != 0)
 		return (result);
 
diff --git a/lib/dns/rdata/generic/soa_6.h b/lib/dns/rdata/generic/soa_6.h
index 1e62015ede..e77a41569d 100644
--- a/lib/dns/rdata/generic/soa_6.h
+++ b/lib/dns/rdata/generic/soa_6.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: soa_6.h,v 1.9 1999/01/22 05:02:48 marka Exp $ */
+ /* $Id: soa_6.h,v 1.10 1999/02/15 05:44:20 marka Exp $ */
 
 #ifndef RDATA_GENERIC_SOA_6_H
 #define RDATA_GENERIC_SOA_6_H
@@ -182,7 +182,7 @@ compare_soa(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	result = dns_name_compare(&name1, &name2);
+	result = dns_name_rdatacompare(&name1, &name2);
 	if (result != 0)
 		return (result);
 
@@ -195,7 +195,7 @@ compare_soa(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	result = dns_name_compare(&name1, &name2);
+	result = dns_name_rdatacompare(&name1, &name2);
 	if (result != 0)
 		return (result);
 
diff --git a/lib/dns/rdata/generic/tkey_249.c b/lib/dns/rdata/generic/tkey_249.c
index 412b1dc3fa..cf10a9b2fb 100644
--- a/lib/dns/rdata/generic/tkey_249.c
+++ b/lib/dns/rdata/generic/tkey_249.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: tkey_249.c,v 1.4 1999/02/05 05:15:16 marka Exp $ */
+ /* $Id: tkey_249.c,v 1.5 1999/02/15 05:44:20 marka Exp $ */
 
  /* draft-ietf-dnssec-tkey-01.txt */
 
@@ -253,7 +253,7 @@ compare_tkey(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_init(&name2, NULL);
 	dns_name_fromregion(&name1, &r1);
 	dns_name_fromregion(&name2, &r2);
-	if ((result = dns_name_compare(&name1, &name2)) != 0)
+	if ((result = dns_name_rdatacompare(&name1, &name2)) != 0)
 		return (result);
 	isc_region_consume(&r1, name_length(&name1));
 	isc_region_consume(&r2, name_length(&name2));
diff --git a/lib/dns/rdata/generic/tkey_249.h b/lib/dns/rdata/generic/tkey_249.h
index fd96623c5d..c95231ae07 100644
--- a/lib/dns/rdata/generic/tkey_249.h
+++ b/lib/dns/rdata/generic/tkey_249.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: tkey_249.h,v 1.4 1999/02/05 05:15:16 marka Exp $ */
+ /* $Id: tkey_249.h,v 1.5 1999/02/15 05:44:20 marka Exp $ */
 
  /* draft-ietf-dnssec-tkey-01.txt */
 
@@ -253,7 +253,7 @@ compare_tkey(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_init(&name2, NULL);
 	dns_name_fromregion(&name1, &r1);
 	dns_name_fromregion(&name2, &r2);
-	if ((result = dns_name_compare(&name1, &name2)) != 0)
+	if ((result = dns_name_rdatacompare(&name1, &name2)) != 0)
 		return (result);
 	isc_region_consume(&r1, name_length(&name1));
 	isc_region_consume(&r2, name_length(&name2));
diff --git a/lib/dns/rdata/in_1/a6_38.c b/lib/dns/rdata/in_1/a6_38.c
index a15eb6f576..b9e377f1f1 100644
--- a/lib/dns/rdata/in_1/a6_38.c
+++ b/lib/dns/rdata/in_1/a6_38.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: a6_38.c,v 1.3 1999/02/09 07:52:32 marka Exp $ */
+ /* $Id: a6_38.c,v 1.4 1999/02/15 05:44:21 marka Exp $ */
 
  /* draft-ietf-ipngwg-dns-lookups-03.txt */
 
@@ -234,7 +234,7 @@ compare_in_a6(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_init(&name2, NULL);
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
-	return (dns_name_compare(&name1, &name2));
+	return (dns_name_rdatacompare(&name1, &name2));
 }
 
 static dns_result_t
diff --git a/lib/dns/rdata/in_1/a6_38.h b/lib/dns/rdata/in_1/a6_38.h
index 6dc0a2aa5a..c9dbb569d4 100644
--- a/lib/dns/rdata/in_1/a6_38.h
+++ b/lib/dns/rdata/in_1/a6_38.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: a6_38.h,v 1.3 1999/02/09 07:52:32 marka Exp $ */
+ /* $Id: a6_38.h,v 1.4 1999/02/15 05:44:21 marka Exp $ */
 
  /* draft-ietf-ipngwg-dns-lookups-03.txt */
 
@@ -234,7 +234,7 @@ compare_in_a6(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_init(&name2, NULL);
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
-	return (dns_name_compare(&name1, &name2));
+	return (dns_name_rdatacompare(&name1, &name2));
 }
 
 static dns_result_t
diff --git a/lib/dns/rdata/in_1/kx_36.c b/lib/dns/rdata/in_1/kx_36.c
index a34b3335c0..244cdfd43e 100644
--- a/lib/dns/rdata/in_1/kx_36.c
+++ b/lib/dns/rdata/in_1/kx_36.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: kx_36.c,v 1.1 1999/02/01 23:49:47 marka Exp $ */
+ /* $Id: kx_36.c,v 1.2 1999/02/15 05:44:21 marka Exp $ */
 
  /* RFC 2230 */
 
@@ -138,7 +138,7 @@ compare_in_kx(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	return (dns_name_compare(&name1, &name2));
+	return (dns_name_rdatacompare(&name1, &name2));
 }
 
 static dns_result_t
diff --git a/lib/dns/rdata/in_1/kx_36.h b/lib/dns/rdata/in_1/kx_36.h
index 8c7ba6b848..c02f07788b 100644
--- a/lib/dns/rdata/in_1/kx_36.h
+++ b/lib/dns/rdata/in_1/kx_36.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: kx_36.h,v 1.1 1999/02/01 23:49:47 marka Exp $ */
+ /* $Id: kx_36.h,v 1.2 1999/02/15 05:44:21 marka Exp $ */
 
  /* RFC 2230 */
 
@@ -138,7 +138,7 @@ compare_in_kx(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	return (dns_name_compare(&name1, &name2));
+	return (dns_name_rdatacompare(&name1, &name2));
 }
 
 static dns_result_t
diff --git a/lib/dns/rdata/in_1/naptr_35.c b/lib/dns/rdata/in_1/naptr_35.c
index 9ed523ad63..ddd224bea5 100644
--- a/lib/dns/rdata/in_1/naptr_35.c
+++ b/lib/dns/rdata/in_1/naptr_35.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: naptr_35.c,v 1.1 1999/02/01 23:49:46 marka Exp $ */
+ /* $Id: naptr_35.c,v 1.2 1999/02/15 05:44:21 marka Exp $ */
 
  /* RFC 2168 */
 
@@ -226,7 +226,7 @@ compare_in_naptr(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	return (dns_name_compare(&name1, &name2));
+	return (dns_name_rdatacompare(&name1, &name2));
 }
 
 static dns_result_t
diff --git a/lib/dns/rdata/in_1/naptr_35.h b/lib/dns/rdata/in_1/naptr_35.h
index 312cb6a377..8113c80b55 100644
--- a/lib/dns/rdata/in_1/naptr_35.h
+++ b/lib/dns/rdata/in_1/naptr_35.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: naptr_35.h,v 1.1 1999/02/01 23:49:46 marka Exp $ */
+ /* $Id: naptr_35.h,v 1.2 1999/02/15 05:44:21 marka Exp $ */
 
  /* RFC 2168 */
 
@@ -226,7 +226,7 @@ compare_in_naptr(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	return (dns_name_compare(&name1, &name2));
+	return (dns_name_rdatacompare(&name1, &name2));
 }
 
 static dns_result_t
diff --git a/lib/dns/rdata/in_1/nsap-ptr_23.c b/lib/dns/rdata/in_1/nsap-ptr_23.c
index 41f1922188..2b9044411f 100644
--- a/lib/dns/rdata/in_1/nsap-ptr_23.c
+++ b/lib/dns/rdata/in_1/nsap-ptr_23.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: nsap-ptr_23.c,v 1.1 1999/02/02 22:34:20 marka Exp $ */
+ /* $Id: nsap-ptr_23.c,v 1.2 1999/02/15 05:44:21 marka Exp $ */
 
  /* RFC 1348 */
 
@@ -118,7 +118,7 @@ compare_in_nsap_ptr(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	return (dns_name_compare(&name1, &name2));
+	return (dns_name_rdatacompare(&name1, &name2));
 }
 
 static dns_result_t
diff --git a/lib/dns/rdata/in_1/nsap-ptr_23.h b/lib/dns/rdata/in_1/nsap-ptr_23.h
index 5e25a2cc9d..9fb71bea96 100644
--- a/lib/dns/rdata/in_1/nsap-ptr_23.h
+++ b/lib/dns/rdata/in_1/nsap-ptr_23.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: nsap-ptr_23.h,v 1.1 1999/02/02 22:34:20 marka Exp $ */
+ /* $Id: nsap-ptr_23.h,v 1.2 1999/02/15 05:44:21 marka Exp $ */
 
  /* RFC 1348 */
 
@@ -118,7 +118,7 @@ compare_in_nsap_ptr(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	return (dns_name_compare(&name1, &name2));
+	return (dns_name_rdatacompare(&name1, &name2));
 }
 
 static dns_result_t
diff --git a/lib/dns/rdata/in_1/px_26.c b/lib/dns/rdata/in_1/px_26.c
index ea1b124e21..523baf4557 100644
--- a/lib/dns/rdata/in_1/px_26.c
+++ b/lib/dns/rdata/in_1/px_26.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: px_26.c,v 1.1 1999/01/31 22:38:40 marka Exp $ */
+ /* $Id: px_26.c,v 1.2 1999/02/15 05:44:22 marka Exp $ */
 
  /* RFC 2163 */
 
@@ -172,7 +172,7 @@ compare_in_px(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	result = dns_name_compare(&name1, &name2);
+	result = dns_name_rdatacompare(&name1, &name2);
 	if (result != 0)
 		return (result);
 
@@ -182,7 +182,7 @@ compare_in_px(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	return (dns_name_compare(&name1, &name2));
+	return (dns_name_rdatacompare(&name1, &name2));
 }
 
 static dns_result_t
diff --git a/lib/dns/rdata/in_1/px_26.h b/lib/dns/rdata/in_1/px_26.h
index 2e6d63294c..e2227edf19 100644
--- a/lib/dns/rdata/in_1/px_26.h
+++ b/lib/dns/rdata/in_1/px_26.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: px_26.h,v 1.1 1999/01/31 22:38:40 marka Exp $ */
+ /* $Id: px_26.h,v 1.2 1999/02/15 05:44:22 marka Exp $ */
 
  /* RFC 2163 */
 
@@ -172,7 +172,7 @@ compare_in_px(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	result = dns_name_compare(&name1, &name2);
+	result = dns_name_rdatacompare(&name1, &name2);
 	if (result != 0)
 		return (result);
 
@@ -182,7 +182,7 @@ compare_in_px(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	return (dns_name_compare(&name1, &name2));
+	return (dns_name_rdatacompare(&name1, &name2));
 }
 
 static dns_result_t
diff --git a/lib/dns/rdata/in_1/srv_33.c b/lib/dns/rdata/in_1/srv_33.c
index a0ec31cdf4..75d8f5c117 100644
--- a/lib/dns/rdata/in_1/srv_33.c
+++ b/lib/dns/rdata/in_1/srv_33.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: srv_33.c,v 1.1 1999/02/01 22:05:56 marka Exp $ */
+ /* $Id: srv_33.c,v 1.2 1999/02/15 05:44:22 marka Exp $ */
 
  /* RFC 2052 bis */
 
@@ -171,7 +171,7 @@ compare_in_srv(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	return (dns_name_compare(&name1, &name2));
+	return (dns_name_rdatacompare(&name1, &name2));
 }
 
 static dns_result_t
diff --git a/lib/dns/rdata/in_1/srv_33.h b/lib/dns/rdata/in_1/srv_33.h
index 0673248b41..fc48f1b9e7 100644
--- a/lib/dns/rdata/in_1/srv_33.h
+++ b/lib/dns/rdata/in_1/srv_33.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: srv_33.h,v 1.1 1999/02/01 22:05:56 marka Exp $ */
+ /* $Id: srv_33.h,v 1.2 1999/02/15 05:44:22 marka Exp $ */
 
  /* RFC 2052 bis */
 
@@ -171,7 +171,7 @@ compare_in_srv(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
 	dns_name_fromregion(&name1, &region1);
 	dns_name_fromregion(&name2, &region2);
 
-	return (dns_name_compare(&name1, &name2));
+	return (dns_name_rdatacompare(&name1, &name2));
 }
 
 static dns_result_t