diff --git a/lib/dns/gen.c b/lib/dns/gen.c
index fd49cc6c4e..947dd455d4 100644
--- a/lib/dns/gen.c
+++ b/lib/dns/gen.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: gen.c,v 1.32 2000/03/17 17:45:01 gson Exp $ */
+/* $Id: gen.c,v 1.33 2000/04/07 03:54:03 explorer Exp $ */
 
 #include <config.h>
 
@@ -132,6 +132,11 @@ struct tt {
 	char dirname[256];		/* XXX Should be max path length */
 } *types;
 
+struct ttnam {
+	char typename[11];
+	char macroname[11];
+} typenames[256];
+
 char *	upper(char *);
 char *	funname(char *, char *);
 void	doswitch(char *, char *, char *, char *, char *, char *);
@@ -139,18 +144,28 @@ void	dodecl(char *, char *, char *);
 void	add(int, char *, int, char *, char *);
 void	sd(int, char *, char *, char);
 
+/*
+ * If you use more than 10 of these in, say, a printf(), you'll have problems.
+ */
 char *
 upper(char *s) {
-	static char buf[11];
-	char *b = buf;
+	static int buf_to_use = 0;
+	static char buf[10][11];
+	char *b;
 	int c;
 
+	buf_to_use++;
+	if (buf_to_use > 9)
+		buf_to_use = 0;
+
+	b = buf[buf_to_use];
+
 	while ((c = (*s++) & 0xff)) {
 		
 		*b++ = islower(c) ? toupper(c) : c;
 	}
 	*b = '\0';
-	return (buf);
+	return (buf[buf_to_use]);
 }
 
 char *
@@ -260,11 +275,28 @@ void
 add(int rdclass, char *classname, int type, char *typename, char *dirname) {
 	struct tt *newtt = (struct tt *)malloc(sizeof *newtt);
 	struct tt *tt, *oldtt;
+	struct ttnam *ttn;
 	struct cc *newcc;
 	struct cc *cc, *oldcc;
 
-	if (newtt == NULL)
+	if (newtt == NULL) {
+		fprintf(stderr, "malloc() failed\n");
 		exit(1);
+	}
+
+	ttn = &typenames[type];
+	if (ttn->typename[0] == 0) {
+		if (strlen(typename) > sizeof(ttn->typename) - 1) {
+			fprintf(stderr, "Error:  type name %s is too long\n",
+				typename);
+			exit(1);
+		}
+		strcpy(ttn->typename, typename);
+	} else if (strcmp(typename, ttn->typename) != 0) {
+		fprintf(stderr, "Error:  type %d has two names: %s, %s\n",
+			type, ttn->typename, typename);
+		exit(1);
+	}
 
 	newtt->next = NULL;
 	newtt->rdclass = rdclass;
@@ -360,6 +392,7 @@ main(int argc, char **argv) {
 	char classname[11];
 	struct tt *tt;
 	struct cc *cc;
+	struct ttnam *ttn;
 	struct tm *tm;
 	time_t now;
 	char year[11];
@@ -368,13 +401,21 @@ main(int argc, char **argv) {
 	int class_enum = 0;
 	int type_enum = 0;
 	int structs = 0;
-	int c;
+	int c, i;
 	char buf1[11];
 	char filetype = 'c';
 	FILE *fd;
 	char *prefix = NULL;
 	char *suffix = NULL;
 	isc_dir_t dir;
+	int special;
+
+	for (i = 0 ; i <= 255 ; i++) {
+		memset(typenames[i].typename, 0,
+		       sizeof(typenames[i].typename));
+		memset(typenames[i].macroname, 0,
+		       sizeof(typenames[i].macroname));
+	}
 
 	strcpy(srcdir, "");
 	while ((c = isc_commandline_parse(argc, argv, "cits:P:S:")) != -1)
@@ -445,6 +486,7 @@ main(int argc, char **argv) {
 	fprintf(stdout, copyright, year);
 
 	if (code) {
+#if 0
 		dodecl("isc_result_t", "fromtext", FROMTEXTDECL);
 		dodecl("isc_result_t", "totext", TOTEXTDECL);
 		dodecl("isc_result_t", "fromwire", FROMWIREDECL);
@@ -455,6 +497,13 @@ main(int argc, char **argv) {
 		dodecl("void", "freestruct", FREESTRUCTDECL);
 		dodecl("isc_result_t", "additionaldata", ADDITIONALDATADECL);
 		dodecl("isc_result_t", "digest", DIGESTDECL);
+#endif
+
+		fputs("\n\n", stdout);
+		for (tt = types; tt != NULL ; tt = tt->next)
+			fprintf(stdout, "#include \"%s/%s_%d.c\"\n",
+				tt->dirname, tt->typename, tt->type);
+		fputs("\n\n", stdout);
 
 		doswitch("FROMTEXTSWITCH", "fromtext", FROMTEXTARGS,
 			 FROMTEXTTYPE, FROMTEXTCLASS, FROMTEXTDEF);
@@ -490,6 +539,133 @@ main(int argc, char **argv) {
 					upper(tt->typename),
 					tt->next != NULL ? " \\" : "");
 
+
+		/*
+		 * Change "invalid" characters to valid ones.  In this
+		 * case, only worry about the - in the nsap-ptr and other
+		 * type names.
+		 */
+		for (i = 0 ; i <= 255 ; i++) {
+			ttn = &typenames[i];
+			if (ttn->typename[0] == 0)
+				continue;
+			strcpy(ttn->macroname, ttn->typename);
+			c = strlen(ttn->macroname);
+			while (c > 0) {
+				if (ttn->macroname[c - 1] == '-')
+					ttn->macroname[c - 1] = '_';
+				c--;
+			}
+		}
+
+#define PRINT_COMMA(x) (x == 255 ? "" : ",")
+
+		printf("\ntypedef struct {\n");
+		printf("\tchar *name;\n");
+		printf("\tunsigned int flags;\n");
+		printf("} typeattr_t;\n");
+		printf("static typeattr_t typeattr[] = {\n");
+		for (i = 0 ; i <= 255 ; i++) {
+			ttn = &typenames[i];
+			special = 0;
+			switch (i) {
+			case 0:
+				printf("\t{ \"RESERVED0\", "
+				       "DNS_RDATATYPEATTR_RESERVED }%s\n",
+				       PRINT_COMMA(i));
+				special = 1;
+				break;
+			case 31:
+				printf("\t{ \"EID\", "
+				       "DNS_RDATATYPEATTR_RESERVED }%s\n",
+				       PRINT_COMMA(i));
+				special = 1;
+				break;
+			case 32:
+				printf("\t{ \"NIMLOC\", "
+				       "DNS_RDATATYPEATTR_RESERVED }%s\n",
+				       PRINT_COMMA(i));
+				special = 1;
+				break;
+			case 34:
+				printf("\t{ \"ATMA\", "
+				       "DNS_RDATATYPEATTR_RESERVED }%s\n",
+				       PRINT_COMMA(i));
+				special = 1;
+				break;
+			case 100:
+				printf("\t{ \"UINFO\", "
+				       "DNS_RDATATYPEATTR_RESERVED }%s\n",
+				       PRINT_COMMA(i));
+				special = 1;
+				break;
+			case 101:
+				printf("\t{ \"UID\", "
+				       "DNS_RDATATYPEATTR_RESERVED }%s\n",
+				       PRINT_COMMA(i));
+				special = 1;
+				break;
+			case 102:
+				printf("\t{ \"GID\", "
+				       "DNS_RDATATYPEATTR_RESERVED }%s\n",
+				       PRINT_COMMA(i));
+				special = 1;
+				break;
+			case 251:
+				printf("\t{ \"IXFR\", "
+				       "DNS_RDATATYPEATTR_META }%s\n",
+				       PRINT_COMMA(i));
+				special = 1;
+				break;
+			case 252:
+				printf("\t{ \"AXFR\", "
+				       "DNS_RDATATYPEATTR_META }%s\n",
+				       PRINT_COMMA(i));
+				special = 1;
+				break;
+			case 253:
+				printf("\t{ \"MAILB\", "
+				       "DNS_RDATATYPEATTR_META }%s\n",
+				       PRINT_COMMA(i));
+				special = 1;
+				break;
+			case 254:
+				printf("\t{ \"MAILA\", "
+				       "DNS_RDATATYPEATTR_META }%s\n",
+				       PRINT_COMMA(i));
+				special = 1;
+				break;
+			case 255:
+				printf("\t{ \"ANY\", "
+				       "DNS_RDATATYPEATTR_META }%s\n",
+				       PRINT_COMMA(i));
+				special = 1;
+				break;
+			default:
+				if (ttn->typename[0] == 0) {
+
+					printf("\t{ \"RRTYPE%d\", "
+					       "DNS_RDATATYPEATTR_UNKNOWN"
+					       "}%s\n", i, PRINT_COMMA(i));
+				} else {
+				printf("\t{ \"%s\", "
+				       "RRTYPE_%s_ATTRIBUTES }%s\n",
+				       upper(ttn->typename),
+				       upper(ttn->macroname),
+				       PRINT_COMMA(i));
+				}
+				break;
+			}
+
+			if (special == 1 && ttn->typename[0] != 0) {
+				fprintf(stderr, "Error!  Special processing for %s, but type is defined in a file also\n",
+				       ttn->typename);
+				exit(1);
+			}
+		}
+		printf("};\n");
+
+
 		fputs("\n", stdout);
 		fprintf(stdout, "\n#define CLASSNAMES%s\n",
 			classes != NULL ? " \\" : "");
@@ -499,11 +675,7 @@ main(int argc, char **argv) {
 				cc->rdclass, upper(cc->classname),
 				cc->next != NULL ? " \\" : "");
 
-
 		fputs("\n", stdout);
-		for (tt = types; tt != NULL ; tt = tt->next)
-			fprintf(stdout, "#include \"%s/%s_%d.c\"\n",
-				tt->dirname, tt->typename, tt->type);
 	} else if (type_enum) {
 		fprintf(stdout, "#ifndef TYPEENUM\n");
 		fprintf(stdout, "#define TYPEENUM%s\n",
diff --git a/lib/dns/include/dns/rdata.h b/lib/dns/include/dns/rdata.h
index b7a63afca3..fb572b2176 100644
--- a/lib/dns/include/dns/rdata.h
+++ b/lib/dns/include/dns/rdata.h
@@ -528,6 +528,33 @@ dns_rdata_digest(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg);
  *	Many other results are possible if not successful.
  */
 
+unsigned int
+dns_rdatatype_attributes(dns_rdatatype_t rdtype);
+/*
+ * Return attributes for the given type.
+ *
+ * Requires:
+ *	'rdtype' are known.
+ *
+ * Returns:
+ *	a bitmask consisting of the following flags.
+ */
+
+/* only one may exist for a name */
+#define DNS_RDATATYPEATTR_SINGLETON	0x00000001U
+/* requires no other data be present */
+#define DNS_RDATATYPEATTR_EXCLUSIVE	0x00000002U
+/* Is a meta type */
+#define DNS_RDATATYPEATTR_META		0x00000004U
+/* Is a DNSSEC type, like SIG or NXT */
+#define DNS_RDATATYPEATTR_DNSSEC		0x00000008U
+/* Is a zone cut authority type XXXMLG */
+#define DNS_RDATATYPEATTR_ZONECUTAUTH	0x00000010U
+/* Is reserved (unusable) */
+#define DNS_RDATATYPEATTR_RESERVED		0x00000020U
+/* Is an unknown type */
+#define DNS_RDATATYPEATTR_UNKNOWN		0x00000040U
+
 dns_rdatatype_t
 dns_rdata_covers(dns_rdata_t *rdata);
 /*
diff --git a/lib/dns/rdata.c b/lib/dns/rdata.c
index 26358669fb..81f852b39a 100644
--- a/lib/dns/rdata.c
+++ b/lib/dns/rdata.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: rdata.c,v 1.73 2000/04/06 22:02:10 explorer Exp $ */
+/* $Id: rdata.c,v 1.74 2000/04/07 03:54:04 explorer Exp $ */
 
 #include <config.h>
 
@@ -641,6 +641,15 @@ dns_rdata_digest(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) {
 	return (result);
 }
 
+unsigned int
+dns_rdatatype_attributes(dns_rdatatype_t type)
+{
+	if (type > 255)
+		return (DNS_RDATATYPEATTR_UNKNOWN);
+
+	return (typeattr[type].flags);
+}
+
 #define NUMBERSIZE sizeof("037777777777") /* 2^32-1 octal + NUL */ 
 
 static isc_result_t
@@ -747,11 +756,17 @@ dns_rdatatype_fromtext(dns_rdatatype_t *typep, isc_textregion_t *source) {
 	return (DNS_R_UNKNOWN);
 }
 
-/* XXXRTH  This should probably be a switch() */
-
 isc_result_t
-dns_rdatatype_totext(dns_rdatatype_t type, isc_buffer_t *target) {
-	return (dns_mnemonic_totext(type, target, types));
+dns_rdatatype_totext(dns_rdatatype_t type, isc_buffer_t *target)
+{
+	char buf[sizeof "RRTYPE4294967296"];
+
+	if (type > 255) {
+		sprintf(buf, "RRTYPE%u", type);
+		return (str_totext(buf, target));
+	}
+
+	return (str_totext(typeattr[type].name, target));
 }
 
 /* XXXRTH  Should we use a hash table here? */
@@ -1553,7 +1568,9 @@ ismeta(unsigned int code, struct tbl *table) {
 
 isc_boolean_t
 dns_rdatatype_ismeta(dns_rdatatype_t type) {
-	return (ismeta(type, types));
+	if ((dns_rdatatype_attributes(type) & DNS_RDATATYPEATTR_META) != 0)
+		return (ISC_TRUE);
+	return (ISC_FALSE);
 }	
 
 isc_boolean_t
@@ -1562,15 +1579,21 @@ dns_rdataclass_ismeta(dns_rdataclass_t rdclass) {
 }
 
 isc_boolean_t
-dns_rdatatype_isdnssec(dns_rdatatype_t type) {
-	return ((type == dns_rdatatype_sig ||
-		 type == dns_rdatatype_key ||
-		 type == dns_rdatatype_nxt) ?
-		ISC_TRUE : ISC_FALSE);
+dns_rdatatype_isdnssec(dns_rdatatype_t type)
+{
+	if ((dns_rdatatype_attributes(type) & DNS_RDATATYPEATTR_DNSSEC) != 0)
+		return (ISC_TRUE);
+	return (ISC_FALSE);
 }
 
 isc_boolean_t
-dns_rdatatype_iszonecutauth(dns_rdatatype_t type) {
+dns_rdatatype_iszonecutauth(dns_rdatatype_t type)
+{
+	if ((dns_rdatatype_attributes(type)
+	     & (DNS_RDATATYPEATTR_DNSSEC | DNS_RDATATYPEATTR_ZONECUTAUTH))
+	    != 0)
+		return (ISC_TRUE);
+	return (ISC_FALSE);
 	return (type == dns_rdatatype_ns ||
 		dns_rdatatype_isdnssec(type) ?
 		ISC_TRUE : ISC_FALSE);
diff --git a/lib/dns/rdata/any_255/tsig_250.c b/lib/dns/rdata/any_255/tsig_250.c
index d2a0989f44..a91ee55a90 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.26 2000/04/06 22:02:40 explorer Exp $ */
+/* $Id: tsig_250.c,v 1.27 2000/04/07 03:54:06 explorer Exp $ */
 
 /* Reviewed: Thu Mar 16 13:39:43 PST 2000 by gson */
 
@@ -26,6 +26,8 @@
 
 #include <isc/str.h>
 
+#define RRTYPE_TSIG_ATTRIBUTES (DNS_RDATATYPEATTR_META)
+
 static inline isc_result_t
 fromtext_any_tsig(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 		  isc_lex_t *lexer, dns_name_t *origin,
diff --git a/lib/dns/rdata/generic/afsdb_18.c b/lib/dns/rdata/generic/afsdb_18.c
index 49cd3a02c4..dc720e4bad 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.20 2000/04/06 22:02:41 explorer Exp $ */
+/* $Id: afsdb_18.c,v 1.21 2000/04/07 03:54:07 explorer Exp $ */
 
 /* Reviewed: Wed Mar 15 14:59:00 PST 2000 by explorer */
 
@@ -24,6 +24,8 @@
 #ifndef RDATA_GENERIC_AFSDB_18_C
 #define RDATA_GENERIC_AFSDB_18_C
 
+#define RRTYPE_AFSDB_ATTRIBUTES (0)
+
 static inline isc_result_t
 fromtext_afsdb(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 	   isc_lex_t *lexer, dns_name_t *origin,
diff --git a/lib/dns/rdata/generic/cert_37.c b/lib/dns/rdata/generic/cert_37.c
index c32858a0ce..46eabb2dee 100644
--- a/lib/dns/rdata/generic/cert_37.c
+++ b/lib/dns/rdata/generic/cert_37.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: cert_37.c,v 1.21 2000/04/06 22:02:42 explorer Exp $ */
+/* $Id: cert_37.c,v 1.22 2000/04/07 03:54:08 explorer Exp $ */
 
 /* Reviewed: Wed Mar 15 21:14:32 EST 2000 by tale */
 
@@ -24,6 +24,8 @@
 #ifndef RDATA_GENERIC_CERT_37_C
 #define RDATA_GENERIC_CERT_37_C
 
+#define RRTYPE_CERT_ATTRIBUTES (0)
+
 static inline isc_result_t
 fromtext_cert(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 	      isc_lex_t *lexer, dns_name_t *origin,
diff --git a/lib/dns/rdata/generic/cname_5.c b/lib/dns/rdata/generic/cname_5.c
index a00b760c53..f8158cbfe0 100644
--- a/lib/dns/rdata/generic/cname_5.c
+++ b/lib/dns/rdata/generic/cname_5.c
@@ -15,13 +15,15 @@
  * SOFTWARE.
  */
 
-/* $Id: cname_5.c,v 1.23 2000/04/06 22:02:43 explorer Exp $ */
+/* $Id: cname_5.c,v 1.24 2000/04/07 03:54:09 explorer Exp $ */
 
 /* reviewed: Wed Mar 15 16:48:45 PST 2000 by brister */
 
 #ifndef RDATA_GENERIC_CNAME_5_C
 #define RDATA_GENERIC_CNAME_5_C
 
+#define RRTYPE_CNAME_ATTRIBUTES (DNS_RDATATYPEATTR_EXCLUSIVE | DNS_RDATATYPEATTR_SINGLETON)
+
 static inline isc_result_t
 fromtext_cname(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 	       isc_lex_t *lexer, dns_name_t *origin,
diff --git a/lib/dns/rdata/generic/dname_39.c b/lib/dns/rdata/generic/dname_39.c
index c0957b1f49..d9d5fb53a4 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.16 2000/04/06 22:02:45 explorer Exp $ */
+/* $Id: dname_39.c,v 1.17 2000/04/07 03:54:10 explorer Exp $ */
 
 /* Reviewed: Wed Mar 15 16:52:38 PST 2000 by explorer */
 
@@ -24,6 +24,8 @@
 #ifndef RDATA_GENERIC_DNAME_39_C
 #define RDATA_GENERIC_DNAME_39_C
 
+#define RRTYPE_DNAME_ATTRIBUTES (DNS_RDATATYPEATTR_SINGLETON)
+
 static inline isc_result_t
 fromtext_dname(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 	       isc_lex_t *lexer, dns_name_t *origin,
diff --git a/lib/dns/rdata/generic/gpos_27.c b/lib/dns/rdata/generic/gpos_27.c
index a408b56901..df87bf8236 100644
--- a/lib/dns/rdata/generic/gpos_27.c
+++ b/lib/dns/rdata/generic/gpos_27.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: gpos_27.c,v 1.15 2000/04/06 22:02:46 explorer Exp $ */
+/* $Id: gpos_27.c,v 1.16 2000/04/07 03:54:12 explorer Exp $ */
 
 /* reviewed: Wed Mar 15 16:48:45 PST 2000 by brister */
 
@@ -24,6 +24,8 @@
 #ifndef RDATA_GENERIC_GPOS_27_C
 #define RDATA_GENERIC_GPOS_27_C
 
+#define RRTYPE_GPOS_ATTRIBUTES (0)
+
 static inline isc_result_t
 fromtext_gpos(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 	      isc_lex_t *lexer, dns_name_t *origin,
diff --git a/lib/dns/rdata/generic/hinfo_13.c b/lib/dns/rdata/generic/hinfo_13.c
index 76e47fef2f..ba5d1ff892 100644
--- a/lib/dns/rdata/generic/hinfo_13.c
+++ b/lib/dns/rdata/generic/hinfo_13.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: hinfo_13.c,v 1.21 2000/04/06 22:02:47 explorer Exp $ */
+/* $Id: hinfo_13.c,v 1.22 2000/04/07 03:54:13 explorer Exp $ */
 
 /*
  * Reviewed: Wed Mar 15 16:47:10 PST 2000 by halley.
@@ -24,6 +24,8 @@
 #ifndef RDATA_GENERIC_HINFO_13_C
 #define RDATA_GENERIC_HINFO_13_C
 
+#define RRTYPE_HINFO_ATTRIBUTES (0)
+
 static inline isc_result_t
 fromtext_hinfo(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 	       isc_lex_t *lexer, dns_name_t *origin,
diff --git a/lib/dns/rdata/generic/isdn_20.c b/lib/dns/rdata/generic/isdn_20.c
index ed61b89dde..e7e335f4af 100644
--- a/lib/dns/rdata/generic/isdn_20.c
+++ b/lib/dns/rdata/generic/isdn_20.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: isdn_20.c,v 1.15 2000/04/06 22:02:49 explorer Exp $ */
+/* $Id: isdn_20.c,v 1.16 2000/04/07 03:54:14 explorer Exp $ */
 
 /* Reviewed: Wed Mar 15 16:53:11 PST 2000 by bwelling */
 
@@ -24,6 +24,8 @@
 #ifndef RDATA_GENERIC_ISDN_20_C
 #define RDATA_GENERIC_ISDN_20_C
 
+#define RRTYPE_ISDN_ATTRIBUTES (0)
+
 static inline isc_result_t
 fromtext_isdn(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 	      isc_lex_t *lexer, dns_name_t *origin,
diff --git a/lib/dns/rdata/generic/key_25.c b/lib/dns/rdata/generic/key_25.c
index 62e40ad1d2..848569a121 100644
--- a/lib/dns/rdata/generic/key_25.c
+++ b/lib/dns/rdata/generic/key_25.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: key_25.c,v 1.18 2000/04/06 22:02:50 explorer Exp $ */
+/* $Id: key_25.c,v 1.19 2000/04/07 03:54:15 explorer Exp $ */
 
 /*
  * Reviewed: Wed Mar 15 16:47:10 PST 2000 by halley.
@@ -26,6 +26,8 @@
 #ifndef RDATA_GENERIC_KEY_25_C
 #define RDATA_GENERIC_KEY_25_C
 
+#define RRTYPE_KEY_ATTRIBUTES (DNS_RDATATYPEATTR_DNSSEC)
+
 static inline isc_result_t
 fromtext_key(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 	     isc_lex_t *lexer, dns_name_t *origin,
diff --git a/lib/dns/rdata/generic/loc_29.c b/lib/dns/rdata/generic/loc_29.c
index e4de614116..37018af339 100644
--- a/lib/dns/rdata/generic/loc_29.c
+++ b/lib/dns/rdata/generic/loc_29.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: loc_29.c,v 1.13 2000/04/06 22:02:51 explorer Exp $ */
+/* $Id: loc_29.c,v 1.14 2000/04/07 03:54:16 explorer Exp $ */
 
 /* Reviewed: Wed Mar 15 18:13:09 PST 2000 by explorer */
 
@@ -24,6 +24,8 @@
 #ifndef RDATA_GENERIC_LOC_29_C
 #define RDATA_GENERIC_LOC_29_C
 
+#define RRTYPE_LOC_ATTRIBUTES (0)
+
 static inline isc_result_t
 fromtext_loc(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 	     isc_lex_t *lexer, dns_name_t *origin,
diff --git a/lib/dns/rdata/generic/mb_7.c b/lib/dns/rdata/generic/mb_7.c
index 5b0cd31280..5808a5f2fd 100644
--- a/lib/dns/rdata/generic/mb_7.c
+++ b/lib/dns/rdata/generic/mb_7.c
@@ -15,13 +15,15 @@
  * SOFTWARE.
  */
 
-/* $Id: mb_7.c,v 1.23 2000/04/06 22:02:53 explorer Exp $ */
+/* $Id: mb_7.c,v 1.24 2000/04/07 03:54:17 explorer Exp $ */
 
 /* Reviewed: Wed Mar 15 17:31:26 PST 2000 by bwelling */
 
 #ifndef RDATA_GENERIC_MB_7_C
 #define RDATA_GENERIC_MB_7_C
 
+#define RRTYPE_MB_ATTRIBUTES (0)
+
 static inline isc_result_t
 fromtext_mb(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 	    isc_lex_t *lexer, dns_name_t *origin,
diff --git a/lib/dns/rdata/generic/md_3.c b/lib/dns/rdata/generic/md_3.c
index a994caa402..84d7446f07 100644
--- a/lib/dns/rdata/generic/md_3.c
+++ b/lib/dns/rdata/generic/md_3.c
@@ -15,13 +15,15 @@
  * SOFTWARE.
  */
 
-/* $Id: md_3.c,v 1.24 2000/04/06 22:02:54 explorer Exp $ */
+/* $Id: md_3.c,v 1.25 2000/04/07 03:54:18 explorer Exp $ */
 
 /* Reviewed: Wed Mar 15 17:48:20 PST 2000 by bwelling */
 
 #ifndef RDATA_GENERIC_MD_3_C
 #define RDATA_GENERIC_MD_3_C
 
+#define RRTYPE_MD_ATTRIBUTES (0)
+
 static inline isc_result_t
 fromtext_md(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 	    isc_lex_t *lexer, dns_name_t *origin,
diff --git a/lib/dns/rdata/generic/mf_4.c b/lib/dns/rdata/generic/mf_4.c
index dfdf005247..b413effd10 100644
--- a/lib/dns/rdata/generic/mf_4.c
+++ b/lib/dns/rdata/generic/mf_4.c
@@ -15,13 +15,15 @@
  * SOFTWARE.
  */
 
-/* $Id: mf_4.c,v 1.22 2000/04/06 22:02:55 explorer Exp $ */
+/* $Id: mf_4.c,v 1.23 2000/04/07 03:54:20 explorer Exp $ */
 
 /* reviewed: Wed Mar 15 17:47:33 PST 2000 by brister */
 
 #ifndef RDATA_GENERIC_MF_4_C
 #define RDATA_GENERIC_MF_4_C
 
+#define RRTYPE_MF_ATTRIBUTES (0)
+
 static inline isc_result_t
 fromtext_mf(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 	    isc_lex_t *lexer, dns_name_t *origin,
diff --git a/lib/dns/rdata/generic/mg_8.c b/lib/dns/rdata/generic/mg_8.c
index 641f5a6d19..0e8db04e0f 100644
--- a/lib/dns/rdata/generic/mg_8.c
+++ b/lib/dns/rdata/generic/mg_8.c
@@ -15,13 +15,15 @@
  * SOFTWARE.
  */
 
-/* $Id: mg_8.c,v 1.21 2000/04/06 22:02:57 explorer Exp $ */
+/* $Id: mg_8.c,v 1.22 2000/04/07 03:54:21 explorer Exp $ */
 
 /* reviewed: Wed Mar 15 17:49:21 PST 2000 by brister */
 
 #ifndef RDATA_GENERIC_MG_8_C
 #define RDATA_GENERIC_MG_8_C
 
+#define RRTYPE_MG_ATTRIBUTES (0)
+
 static inline isc_result_t
 fromtext_mg(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 	    isc_lex_t *lexer, dns_name_t *origin,
diff --git a/lib/dns/rdata/generic/minfo_14.c b/lib/dns/rdata/generic/minfo_14.c
index d7ea05a7d0..c1de10c02c 100644
--- a/lib/dns/rdata/generic/minfo_14.c
+++ b/lib/dns/rdata/generic/minfo_14.c
@@ -15,13 +15,15 @@
  * SOFTWARE.
  */
 
-/* $Id: minfo_14.c,v 1.22 2000/04/06 22:02:58 explorer Exp $ */
+/* $Id: minfo_14.c,v 1.23 2000/04/07 03:54:22 explorer Exp $ */
 
 /* reviewed: Wed Mar 15 17:45:32 PST 2000 by brister */
 
 #ifndef RDATA_GENERIC_MINFO_14_C
 #define RDATA_GENERIC_MINFO_14_C
 
+#define RRTYPE_MINFO_ATTRIBUTES (0)
+
 static inline isc_result_t
 fromtext_minfo(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 	       isc_lex_t *lexer, dns_name_t *origin,
diff --git a/lib/dns/rdata/generic/mr_9.c b/lib/dns/rdata/generic/mr_9.c
index a58e2d55da..9c45b8dd36 100644
--- a/lib/dns/rdata/generic/mr_9.c
+++ b/lib/dns/rdata/generic/mr_9.c
@@ -15,13 +15,15 @@
  * SOFTWARE.
  */
 
-/* $Id: mr_9.c,v 1.20 2000/04/06 22:03:00 explorer Exp $ */
+/* $Id: mr_9.c,v 1.21 2000/04/07 03:54:23 explorer Exp $ */
 
 /* Reviewed: Wed Mar 15 21:30:35 EST 2000 by tale */
 
 #ifndef RDATA_GENERIC_MR_9_C
 #define RDATA_GENERIC_MR_9_C
 
+#define RRTYPE_MR_ATTRIBUTES (0)
+
 static inline isc_result_t
 fromtext_mr(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 	    isc_lex_t *lexer, dns_name_t *origin,
diff --git a/lib/dns/rdata/generic/mx_15.c b/lib/dns/rdata/generic/mx_15.c
index 60ed818ba3..bfba4b7680 100644
--- a/lib/dns/rdata/generic/mx_15.c
+++ b/lib/dns/rdata/generic/mx_15.c
@@ -15,13 +15,15 @@
  * SOFTWARE.
  */
 
-/* $Id: mx_15.c,v 1.27 2000/04/06 22:03:01 explorer Exp $ */
+/* $Id: mx_15.c,v 1.28 2000/04/07 03:54:24 explorer Exp $ */
 
 /* reviewed: Wed Mar 15 18:05:46 PST 2000 by brister */
 
 #ifndef RDATA_GENERIC_MX_15_C
 #define RDATA_GENERIC_MX_15_C
 
+#define RRTYPE_MX_ATTRIBUTES (0)
+
 static inline isc_result_t
 fromtext_mx(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 	    isc_lex_t *lexer, dns_name_t *origin,
diff --git a/lib/dns/rdata/generic/ns_2.c b/lib/dns/rdata/generic/ns_2.c
index 9663610782..c79cc4a339 100644
--- a/lib/dns/rdata/generic/ns_2.c
+++ b/lib/dns/rdata/generic/ns_2.c
@@ -15,13 +15,15 @@
  * SOFTWARE.
  */
 
-/* $Id: ns_2.c,v 1.23 2000/04/06 22:03:02 explorer Exp $ */
+/* $Id: ns_2.c,v 1.24 2000/04/07 03:54:25 explorer Exp $ */
 
 /* Reviewed: Wed Mar 15 18:15:00 PST 2000 by bwelling */
 
 #ifndef RDATA_GENERIC_NS_2_C
 #define RDATA_GENERIC_NS_2_C
 
+#define RRTYPE_NS_ATTRIBUTES (DNS_RDATATYPEATTR_ZONECUTAUTH)
+
 static inline isc_result_t
 fromtext_ns(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 	    isc_lex_t *lexer, dns_name_t *origin,
diff --git a/lib/dns/rdata/generic/null_10.c b/lib/dns/rdata/generic/null_10.c
index 28b999cb6e..a6b4bbf58a 100644
--- a/lib/dns/rdata/generic/null_10.c
+++ b/lib/dns/rdata/generic/null_10.c
@@ -15,13 +15,15 @@
  * SOFTWARE.
  */
 
-/* $Id: null_10.c,v 1.19 2000/04/06 22:03:03 explorer Exp $ */
+/* $Id: null_10.c,v 1.20 2000/04/07 03:54:26 explorer Exp $ */
 
 /* Reviewed: Thu Mar 16 13:57:50 PST 2000 by explorer */
 
 #ifndef RDATA_GENERIC_NULL_10_C
 #define RDATA_GENERIC_NULL_10_C
 
+#define RRTYPE_NULL_ATTRIBUTES (0)
+
 static inline isc_result_t
 fromtext_null(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 	      isc_lex_t *lexer, dns_name_t *origin,
diff --git a/lib/dns/rdata/generic/nxt_30.c b/lib/dns/rdata/generic/nxt_30.c
index 478ed852fd..07b4f1a5c9 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.24 2000/04/06 22:03:05 explorer Exp $ */
+/* $Id: nxt_30.c,v 1.25 2000/04/07 03:54:27 explorer Exp $ */
 
 /* reviewed: Wed Mar 15 18:21:15 PST 2000 by brister */
 
@@ -24,6 +24,8 @@
 #ifndef RDATA_GENERIC_NXT_30_C
 #define RDATA_GENERIC_NXT_30_C
 
+#define RRTYPE_NXT_ATTRIBUTES (DNS_RDATATYPEATTR_DNSSEC | DNS_RDATATYPEATTR_SINGLETON)
+
 static inline isc_result_t
 fromtext_nxt(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 	     isc_lex_t *lexer, dns_name_t *origin,
diff --git a/lib/dns/rdata/generic/opt_41.c b/lib/dns/rdata/generic/opt_41.c
index 88f2d3c563..d0f7cfb9ef 100644
--- a/lib/dns/rdata/generic/opt_41.c
+++ b/lib/dns/rdata/generic/opt_41.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: opt_41.c,v 1.6 2000/04/06 22:03:06 explorer Exp $ */
+/* $Id: opt_41.c,v 1.7 2000/04/07 03:54:28 explorer Exp $ */
 
 /* Reviewed: Thu Mar 16 14:06:44 PST 2000 by gson */
 
@@ -24,6 +24,8 @@
 #ifndef RDATA_GENERIC_OPT_41_C
 #define RDATA_GENERIC_OPT_41_C
 
+#define RRTYPE_OPT_ATTRIBUTES (DNS_RDATATYPEATTR_SINGLETON)
+
 static inline isc_result_t
 fromtext_opt(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 	     isc_lex_t *lexer, dns_name_t *origin,
diff --git a/lib/dns/rdata/generic/proforma.c b/lib/dns/rdata/generic/proforma.c
index dec5e190f3..09c901836a 100644
--- a/lib/dns/rdata/generic/proforma.c
+++ b/lib/dns/rdata/generic/proforma.c
@@ -15,11 +15,13 @@
  * SOFTWARE.
  */
 
-/* $Id: proforma.c,v 1.20 2000/04/06 22:03:07 explorer Exp $ */
+/* $Id: proforma.c,v 1.21 2000/04/07 03:54:29 explorer Exp $ */
 
 #ifndef RDATA_GENERIC_#_#_C
 #define RDATA_GENERIC_#_#_C
 
+#define RRTYPE_#_ATTRIBUTES (0)
+
 static inline isc_result_t
 fromtext_#(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 	   isc_lex_t *lexer, dns_name_t *origin,
diff --git a/lib/dns/rdata/generic/ptr_12.c b/lib/dns/rdata/generic/ptr_12.c
index 6c0d651402..ecbb0abdf0 100644
--- a/lib/dns/rdata/generic/ptr_12.c
+++ b/lib/dns/rdata/generic/ptr_12.c
@@ -15,13 +15,15 @@
  * SOFTWARE.
  */
 
-/* $Id: ptr_12.c,v 1.21 2000/04/06 22:03:08 explorer Exp $ */
+/* $Id: ptr_12.c,v 1.22 2000/04/07 03:54:30 explorer Exp $ */
 
 /* Reviewed: Thu Mar 16 14:05:12 PST 2000 by explorer */
 
 #ifndef RDATA_GENERIC_PTR_12_C
 #define RDATA_GENERIC_PTR_12_C
 
+#define RRTYPE_PTR_ATTRIBUTES (0)
+
 static inline isc_result_t
 fromtext_ptr(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 	     isc_lex_t *lexer, dns_name_t *origin,
diff --git a/lib/dns/rdata/generic/rp_17.c b/lib/dns/rdata/generic/rp_17.c
index 04397cb81d..ea746801ff 100644
--- a/lib/dns/rdata/generic/rp_17.c
+++ b/lib/dns/rdata/generic/rp_17.c
@@ -15,13 +15,15 @@
  * SOFTWARE.
  */
 
-/* $Id: rp_17.c,v 1.18 2000/04/06 22:03:09 explorer Exp $ */
+/* $Id: rp_17.c,v 1.19 2000/04/07 03:54:32 explorer Exp $ */
 
 /* RFC 1183 */
 
 #ifndef RDATA_GENERIC_RP_17_C
 #define RDATA_GENERIC_RP_17_C
 
+#define RRTYPE_RP_ATTRIBUTES (0)
+
 static inline isc_result_t
 fromtext_rp(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 	    isc_lex_t *lexer, dns_name_t *origin,
diff --git a/lib/dns/rdata/generic/rt_21.c b/lib/dns/rdata/generic/rt_21.c
index 5e1837ddc1..bf4f5a9464 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.18 2000/04/06 22:03:11 explorer Exp $ */
+/* $Id: rt_21.c,v 1.19 2000/04/07 03:54:33 explorer Exp $ */
 
 /* reviewed: Thu Mar 16 15:02:31 PST 2000 by brister */
 
@@ -24,6 +24,8 @@
 #ifndef RDATA_GENERIC_RT_21_C
 #define RDATA_GENERIC_RT_21_C
 
+#define RRTYPE_RT_ATTRIBUTES (0)
+
 static inline isc_result_t
 fromtext_rt(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 	    isc_lex_t *lexer, dns_name_t *origin,
diff --git a/lib/dns/rdata/generic/sig_24.c b/lib/dns/rdata/generic/sig_24.c
index dc7cd1ef9e..837657e9c9 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.31 2000/04/06 22:03:12 explorer Exp $ */
+/* $Id: sig_24.c,v 1.32 2000/04/07 03:54:34 explorer Exp $ */
 
 /* Reviewed: Fri Mar 17 09:05:02 PST 2000 by gson */
 
@@ -24,6 +24,8 @@
 #ifndef RDATA_GENERIC_SIG_24_C
 #define RDATA_GENERIC_SIG_24_C
 
+#define RRTYPE_SIG_ATTRIBUTES (DNS_RDATATYPEATTR_DNSSEC)
+
 static inline isc_result_t
 fromtext_sig(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 	     isc_lex_t *lexer, dns_name_t *origin,
diff --git a/lib/dns/rdata/generic/soa_6.c b/lib/dns/rdata/generic/soa_6.c
index 0f88d052c5..e010ef0af6 100644
--- a/lib/dns/rdata/generic/soa_6.c
+++ b/lib/dns/rdata/generic/soa_6.c
@@ -15,13 +15,15 @@
  * SOFTWARE.
  */
 
-/* $Id: soa_6.c,v 1.31 2000/04/06 22:03:13 explorer Exp $ */
+/* $Id: soa_6.c,v 1.32 2000/04/07 03:54:35 explorer Exp $ */
 
 /* Reviewed: Thu Mar 16 15:18:32 PST 2000 by explorer */
 
 #ifndef RDATA_GENERIC_SOA_6_C
 #define RDATA_GENERIC_SOA_6_C
 
+#define RRTYPE_SOA_ATTRIBUTES (DNS_RDATATYPEATTR_SINGLETON)
+
 static inline isc_result_t
 fromtext_soa(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 	     isc_lex_t *lexer, dns_name_t *origin,
diff --git a/lib/dns/rdata/generic/tkey_249.c b/lib/dns/rdata/generic/tkey_249.c
index 8b08adf549..9f603dd73b 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.24 2000/04/06 22:03:15 explorer Exp $ */
+/* $Id: tkey_249.c,v 1.25 2000/04/07 03:54:36 explorer Exp $ */
 
 /*
  * Reviewed: Thu Mar 16 17:35:30 PST 2000 by halley.
@@ -26,6 +26,8 @@
 #ifndef RDATA_GENERIC_TKEY_249_C
 #define RDATA_GENERIC_TKEY_249_C
 
+#define RRTYPE_TKEY_ATTRIBUTES (DNS_RDATATYPEATTR_META)
+
 static inline isc_result_t
 fromtext_tkey(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 		  isc_lex_t *lexer, dns_name_t *origin,
diff --git a/lib/dns/rdata/generic/txt_16.c b/lib/dns/rdata/generic/txt_16.c
index c367618afb..599fdde2aa 100644
--- a/lib/dns/rdata/generic/txt_16.c
+++ b/lib/dns/rdata/generic/txt_16.c
@@ -15,13 +15,15 @@
  * SOFTWARE.
  */
 
-/* $Id: txt_16.c,v 1.21 2000/04/06 22:03:16 explorer Exp $ */
+/* $Id: txt_16.c,v 1.22 2000/04/07 03:54:37 explorer Exp $ */
 
 /* Reviewed: Thu Mar 16 15:40:00 PST 2000 by bwelling */
 
 #ifndef RDATA_GENERIC_TXT_16_C
 #define RDATA_GENERIC_TXT_16_C
 
+#define RRTYPE_TXT_ATTRIBUTES (0)
+
 static inline isc_result_t
 fromtext_txt(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 	     isc_lex_t *lexer, dns_name_t *origin,
diff --git a/lib/dns/rdata/generic/unspec_103.c b/lib/dns/rdata/generic/unspec_103.c
index bec0ad3ed4..6d91838ef3 100644
--- a/lib/dns/rdata/generic/unspec_103.c
+++ b/lib/dns/rdata/generic/unspec_103.c
@@ -15,11 +15,13 @@
  * SOFTWARE.
  */
 
-/* $Id: unspec_103.c,v 1.13 2000/04/06 22:03:18 explorer Exp $ */
+/* $Id: unspec_103.c,v 1.14 2000/04/07 03:54:38 explorer Exp $ */
 
 #ifndef RDATA_GENERIC_UNSPEC_103_C
 #define RDATA_GENERIC_UNSPEC_103_C
 
+#define RRTYPE_UNSPEC_ATTRIBUTES (0)
+
 static inline isc_result_t
 fromtext_unspec(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 		isc_lex_t *lexer, dns_name_t *origin,
diff --git a/lib/dns/rdata/generic/x25_19.c b/lib/dns/rdata/generic/x25_19.c
index 6bf86d7c15..5d82cea709 100644
--- a/lib/dns/rdata/generic/x25_19.c
+++ b/lib/dns/rdata/generic/x25_19.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: x25_19.c,v 1.13 2000/04/06 22:03:19 explorer Exp $ */
+/* $Id: x25_19.c,v 1.14 2000/04/07 03:54:40 explorer Exp $ */
 
 /* Reviewed: Thu Mar 16 16:15:57 PST 2000 by bwelling */
 
@@ -24,6 +24,8 @@
 #ifndef RDATA_GENERIC_X25_19_C
 #define RDATA_GENERIC_X25_19_C
 
+#define RRTYPE_X25_ATTRIBUTES (0)
+
 #include <ctype.h>
 
 static inline isc_result_t
diff --git a/lib/dns/rdata/hs_4/a_1.c b/lib/dns/rdata/hs_4/a_1.c
index e52fbe6c61..4ecc74778d 100644
--- a/lib/dns/rdata/hs_4/a_1.c
+++ b/lib/dns/rdata/hs_4/a_1.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: a_1.c,v 1.6 2000/04/06 22:03:20 explorer Exp $ */
+/* $Id: a_1.c,v 1.7 2000/04/07 03:54:41 explorer Exp $ */
 
 /* reviewed: Thu Mar 16 15:58:36 PST 2000 by brister */
 
@@ -26,6 +26,8 @@
 
 #include <isc/net.h>
 
+#define RRTYPE_A_ATTRIBUTES (0)
+
 static inline isc_result_t
 fromtext_hs_a(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 	      isc_lex_t *lexer, dns_name_t *origin,
diff --git a/lib/dns/rdata/in_1/a6_38.c b/lib/dns/rdata/in_1/a6_38.c
index 2f960aa721..27ecead15f 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.23 2000/04/06 22:03:22 explorer Exp $ */
+ /* $Id: a6_38.c,v 1.24 2000/04/07 03:54:42 explorer Exp $ */
 
  /* draft-ietf-ipngwg-dns-lookups-03.txt */
 
@@ -26,6 +26,8 @@
 
 #include <isc/net.h>
 
+#define RRTYPE_A6_ATTRIBUTES (0)
+
 static inline isc_result_t
 fromtext_in_a6(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 	       isc_lex_t *lexer, dns_name_t *origin,
diff --git a/lib/dns/rdata/in_1/a_1.c b/lib/dns/rdata/in_1/a_1.c
index 24e60cf79d..869a95f8b1 100644
--- a/lib/dns/rdata/in_1/a_1.c
+++ b/lib/dns/rdata/in_1/a_1.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: a_1.c,v 1.26 2000/04/06 22:03:23 explorer Exp $ */
+/* $Id: a_1.c,v 1.27 2000/04/07 03:54:43 explorer Exp $ */
 
 /* Reviewed: Thu Mar 16 16:52:50 PST 2000 by bwelling */
 
@@ -26,6 +26,8 @@
 
 #include <isc/net.h>
 
+#define RRTYPE_A_ATTRIBUTES (0)
+
 static inline isc_result_t
 fromtext_in_a(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 	      isc_lex_t *lexer, dns_name_t *origin,
diff --git a/lib/dns/rdata/in_1/aaaa_28.c b/lib/dns/rdata/in_1/aaaa_28.c
index 6296b6a622..494a4609b7 100644
--- a/lib/dns/rdata/in_1/aaaa_28.c
+++ b/lib/dns/rdata/in_1/aaaa_28.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: aaaa_28.c,v 1.18 2000/04/06 22:03:25 explorer Exp $ */
+/* $Id: aaaa_28.c,v 1.19 2000/04/07 03:54:44 explorer Exp $ */
 
 /* Reviewed: Thu Mar 16 16:52:50 PST 2000 by bwelling */
 
@@ -28,6 +28,8 @@
 
 #include <isc/net.h>
 
+#define RRTYPE_AAAA_ATTRIBUTES (0)
+
 static inline isc_result_t
 fromtext_in_aaaa(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 		 isc_lex_t *lexer, dns_name_t *origin,
diff --git a/lib/dns/rdata/in_1/kx_36.c b/lib/dns/rdata/in_1/kx_36.c
index ee2bf39755..7f6adcd889 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.20 2000/04/06 22:03:26 explorer Exp $ */
+/* $Id: kx_36.c,v 1.21 2000/04/07 03:54:45 explorer Exp $ */
 
 /* Reviewed: Thu Mar 16 17:24:54 PST 2000 by explorer */
 
@@ -24,6 +24,8 @@
 #ifndef RDATA_GENERIC_KX_36_C
 #define RDATA_GENERIC_KX_36_C
 
+#define RRTYPE_KX_ATTRIBUTES (0)
+
 static inline isc_result_t
 fromtext_in_kx(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 	       isc_lex_t *lexer, dns_name_t *origin,
diff --git a/lib/dns/rdata/in_1/naptr_35.c b/lib/dns/rdata/in_1/naptr_35.c
index 6499a52f68..a6cd8b6000 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.19 2000/04/06 22:03:27 explorer Exp $ */
+/* $Id: naptr_35.c,v 1.20 2000/04/07 03:54:46 explorer Exp $ */
 
 /* Reviewed: Thu Mar 16 16:52:50 PST 2000 by bwelling */
 
@@ -24,6 +24,8 @@
 #ifndef RDATA_IN_1_NAPTR_35_C
 #define RDATA_IN_1_NAPTR_35_C
 
+#define RRTYPE_NAPTR_ATTRIBUTES (0)
+
 static inline isc_result_t
 fromtext_in_naptr(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 		  isc_lex_t *lexer, dns_name_t *origin,
diff --git a/lib/dns/rdata/in_1/nsap-ptr_23.c b/lib/dns/rdata/in_1/nsap-ptr_23.c
index 5d20943ec6..b02e0f0767 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.15 2000/04/06 22:03:28 explorer Exp $ */
+/* $Id: nsap-ptr_23.c,v 1.16 2000/04/07 03:54:47 explorer Exp $ */
 
 /* Reviewed: Fri Mar 17 10:16:02 PST 2000 by gson */
 
@@ -24,6 +24,8 @@
 #ifndef RDATA_IN_1_NSAP_PTR_23_C
 #define RDATA_IN_1_NSAP_PTR_23_C
 
+#define RRTYPE_NSAP_PTR_ATTRIBUTES (0)
+
 static inline isc_result_t
 fromtext_in_nsap_ptr(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 		     isc_lex_t *lexer, dns_name_t *origin,
diff --git a/lib/dns/rdata/in_1/nsap_22.c b/lib/dns/rdata/in_1/nsap_22.c
index af90b36ce5..69dc18ee0a 100644
--- a/lib/dns/rdata/in_1/nsap_22.c
+++ b/lib/dns/rdata/in_1/nsap_22.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: nsap_22.c,v 1.15 2000/04/06 22:03:30 explorer Exp $ */
+/* $Id: nsap_22.c,v 1.16 2000/04/07 03:54:48 explorer Exp $ */
 
 /* Reviewed: Fri Mar 17 10:41:07 PST 2000 by gson */
 
@@ -26,6 +26,8 @@
 
 #include <string.h>
 
+#define RRTYPE_NSAP_ATTRIBUTES (0)
+
 static inline isc_result_t
 fromtext_in_nsap(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 	         isc_lex_t *lexer, dns_name_t *origin,
diff --git a/lib/dns/rdata/in_1/px_26.c b/lib/dns/rdata/in_1/px_26.c
index 9e42ad752f..989ea6df25 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.16 2000/04/06 22:03:32 explorer Exp $ */
+/* $Id: px_26.c,v 1.17 2000/04/07 03:54:50 explorer Exp $ */
 
 /* Reviewed: Mon Mar 20 10:44:27 PST 2000 */
 
@@ -24,6 +24,8 @@
 #ifndef RDATA_IN_1_PX_26_C
 #define RDATA_IN_1_PX_26_C
 
+#define RRTYPE_PX_ATTRIBUTES (0)
+
 static inline isc_result_t
 fromtext_in_px(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 	       isc_lex_t *lexer, dns_name_t *origin,
diff --git a/lib/dns/rdata/in_1/srv_33.c b/lib/dns/rdata/in_1/srv_33.c
index 88bd6e6f9f..313f46c277 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.17 2000/04/06 22:03:33 explorer Exp $ */
+/* $Id: srv_33.c,v 1.18 2000/04/07 03:54:51 explorer Exp $ */
 
 /* Reviewed: Fri Mar 17 13:01:00 PST 2000 by bwelling */
 
@@ -24,6 +24,8 @@
 #ifndef RDATA_IN_1_SRV_33_C
 #define RDATA_IN_1_SRV_33_C
 
+#define RRTYPE_SRV_ATTRIBUTES (0)
+
 static inline isc_result_t
 fromtext_in_srv(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 		isc_lex_t *lexer, dns_name_t *origin,
diff --git a/lib/dns/rdata/in_1/wks_11.c b/lib/dns/rdata/in_1/wks_11.c
index cfe9f4766a..4595b5efbe 100644
--- a/lib/dns/rdata/in_1/wks_11.c
+++ b/lib/dns/rdata/in_1/wks_11.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: wks_11.c,v 1.23 2000/04/06 22:03:34 explorer Exp $ */
+/* $Id: wks_11.c,v 1.24 2000/04/07 03:54:52 explorer Exp $ */
 
 /* Reviewed: Fri Mar 17 15:01:49 PST 2000 by explorer */
 
@@ -29,6 +29,8 @@
 #include <isc/net.h>
 #include <isc/netdb.h>
 
+#define RRTYPE_WKS_ATTRIBUTES (0)
+
 static inline isc_result_t
 fromtext_in_wks(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 		isc_lex_t *lexer, dns_name_t *origin,