Changes to generated files related to the 9.3.3 import.

4 files changed, 26 insertions, 26 deletions

diff --git a/lib/bind/dns/code.h b/lib/bind/dns/code.h
index 7cf495e..8bb81bb 100644
--- a/lib/bind/dns/code.h
+++ b/lib/bind/dns/code.h
@@ -1,7 +1,7 @@
 /* $FreeBSD$ */
 
 /*
- * Copyright (C) 2004-2005 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003 Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -79,7 +79,7 @@
 #include "rdata/generic/unspec_103.c"
 #include "rdata/generic/tkey_249.c"
 #include "rdata/any_255/tsig_250.c"
-#include "rdata/generic/dlv_65323.c"
+#include "rdata/generic/dlv_32769.c"
 
 
 
@@ -180,7 +180,7 @@
 		default: result = DNS_R_UNKNOWN; break; \
 		} \
 		break; \
-	case 65323: result = fromtext_dlv(rdclass, type, lexer, origin, options, target, callbacks); break; \
+	case 32769: result = fromtext_dlv(rdclass, type, lexer, origin, options, target, callbacks); break; \
 	default: result = DNS_R_UNKNOWN; break; \
 	}
 
@@ -281,7 +281,7 @@
 		default: use_default = ISC_TRUE; break; \
 		} \
 		break; \
-	case 65323: result = totext_dlv(rdata, tctx, target); break; \
+	case 32769: result = totext_dlv(rdata, tctx, target); break; \
 	default: use_default = ISC_TRUE; break; \
 	}
 
@@ -382,7 +382,7 @@
 		default: use_default = ISC_TRUE; break; \
 		} \
 		break; \
-	case 65323: result = fromwire_dlv(rdclass, type, source, dctx, options, target); break; \
+	case 32769: result = fromwire_dlv(rdclass, type, source, dctx, options, target); break; \
 	default: use_default = ISC_TRUE; break; \
 	}
 
@@ -483,7 +483,7 @@
 		default: use_default = ISC_TRUE; break; \
 		} \
 		break; \
-	case 65323: result = towire_dlv(rdata, cctx, target); break; \
+	case 32769: result = towire_dlv(rdata, cctx, target); break; \
 	default: use_default = ISC_TRUE; break; \
 	}
 
@@ -584,7 +584,7 @@
 		default: use_default = ISC_TRUE; break; \
 		} \
 		break; \
-	case 65323: result = compare_dlv(rdata1, rdata2); break; \
+	case 32769: result = compare_dlv(rdata1, rdata2); break; \
 	default: use_default = ISC_TRUE; break; \
 	}
 
@@ -685,7 +685,7 @@
 		default: use_default = ISC_TRUE; break; \
 		} \
 		break; \
-	case 65323: result = fromstruct_dlv(rdclass, type, source, target); break; \
+	case 32769: result = fromstruct_dlv(rdclass, type, source, target); break; \
 	default: use_default = ISC_TRUE; break; \
 	}
 
@@ -786,7 +786,7 @@
 		default: use_default = ISC_TRUE; break; \
 		} \
 		break; \
-	case 65323: result = tostruct_dlv(rdata, target, mctx); break; \
+	case 32769: result = tostruct_dlv(rdata, target, mctx); break; \
 	default: use_default = ISC_TRUE; break; \
 	}
 
@@ -887,7 +887,7 @@
 		default: break; \
 		} \
 		break; \
-	case 65323: freestruct_dlv(source); break; \
+	case 32769: freestruct_dlv(source); break; \
 	default: break; \
 	}
 
@@ -988,7 +988,7 @@
 		default: use_default = ISC_TRUE; break; \
 		} \
 		break; \
-	case 65323: result = additionaldata_dlv(rdata, add, arg); break; \
+	case 32769: result = additionaldata_dlv(rdata, add, arg); break; \
 	default: use_default = ISC_TRUE; break; \
 	}
 
@@ -1089,7 +1089,7 @@
 		default: use_default = ISC_TRUE; break; \
 		} \
 		break; \
-	case 65323: result = digest_dlv(rdata, digest, arg); break; \
+	case 32769: result = digest_dlv(rdata, digest, arg); break; \
 	default: use_default = ISC_TRUE; break; \
 	}
 
@@ -1190,7 +1190,7 @@
 		default: result = ISC_TRUE; break; \
 		} \
 		break; \
-	case 65323: result = checkowner_dlv(name, rdclass, type, wildcard); break; \
+	case 32769: result = checkowner_dlv(name, rdclass, type, wildcard); break; \
 	default: result = ISC_TRUE; break; \
 	}
 
@@ -1291,7 +1291,7 @@
 		default: result = ISC_TRUE; break; \
 		} \
 		break; \
-	case 65323: result = checknames_dlv(rdata, owner, bad); break; \
+	case 32769: result = checknames_dlv(rdata, owner, bad); break; \
 	default: result = ISC_TRUE; break; \
 	}
 #define RDATATYPE_COMPARE(_s, _d, _tn, _n, _tp) \
@@ -1380,7 +1380,7 @@
 			break; \
 		case 122: \
 			RDATATYPE_COMPARE("sig", 24, _typename, _length, _typep); \
-			RDATATYPE_COMPARE("dlv", 65323, _typename, _length, _typep); \
+			RDATATYPE_COMPARE("dlv", 32769, _typename, _length, _typep); \
 			break; \
 		case 254: \
 			RDATATYPE_COMPARE("key", 25, _typename, _length, _typep); \
@@ -1531,7 +1531,7 @@
 	case 253: return (DNS_RDATATYPEATTR_META | DNS_RDATATYPEATTR_QUESTIONONLY); \
 	case 254: return (DNS_RDATATYPEATTR_META | DNS_RDATATYPEATTR_QUESTIONONLY); \
 	case 255: return (DNS_RDATATYPEATTR_META | DNS_RDATATYPEATTR_QUESTIONONLY); \
-	case 65323: return (RRTYPE_DLV_ATTRIBUTES); \
+	case 32769: return (RRTYPE_DLV_ATTRIBUTES); \
 	}
 #define RDATATYPE_TOTEXT_SW \
 	switch (type) { \
@@ -1593,6 +1593,6 @@
 	case 253: return (str_totext("MAILB", target)); \
 	case 254: return (str_totext("MAILA", target)); \
 	case 255: return (str_totext("ANY", target)); \
-	case 65323: return (str_totext("DLV", target)); \
+	case 32769: return (str_totext("DLV", target)); \
 	}
 #endif /* DNS_CODE_H */
diff --git a/lib/bind/dns/dns/enumclass.h b/lib/bind/dns/dns/enumclass.h
index f3490a4..1ce2513 100644
--- a/lib/bind/dns/dns/enumclass.h
+++ b/lib/bind/dns/dns/enumclass.h
@@ -1,7 +1,7 @@
 /* $FreeBSD$ */
 
 /*
- * Copyright (C) 2004-2005 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003 Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
diff --git a/lib/bind/dns/dns/enumtype.h b/lib/bind/dns/dns/enumtype.h
index 8692368..ae082d7 100644
--- a/lib/bind/dns/dns/enumtype.h
+++ b/lib/bind/dns/dns/enumtype.h
@@ -1,7 +1,7 @@
 /* $FreeBSD$ */
 
 /*
- * Copyright (C) 2004-2005 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003 Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -75,7 +75,7 @@ enum {
 	dns_rdatatype_unspec = 103,
 	dns_rdatatype_tkey = 249,
 	dns_rdatatype_tsig = 250,
-	dns_rdatatype_dlv = 65323,
+	dns_rdatatype_dlv = 32769,
 	dns_rdatatype_ixfr = 251,
 	dns_rdatatype_axfr = 252,
 	dns_rdatatype_mailb = 253,
diff --git a/lib/bind/dns/dns/rdatastruct.h b/lib/bind/dns/dns/rdatastruct.h
index ce30e49..96c9f66 100644
--- a/lib/bind/dns/dns/rdatastruct.h
+++ b/lib/bind/dns/dns/rdatastruct.h
@@ -1,7 +1,7 @@
 /* $FreeBSD$ */
 
 /*
- * Copyright (C) 2004-2005 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003 Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -1677,7 +1677,7 @@ typedef struct dns_rdata_any_tsig {
 
 #endif /* ANY_255_TSIG_250_H */
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -1692,11 +1692,11 @@ typedef struct dns_rdata_any_tsig {
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dlv_65323.h,v 1.2.2.3 2004/03/15 01:02:55 marka Exp $ */
+/* $Id: dlv_32769.h,v 1.2.4.2 2006/02/19 06:50:46 marka Exp $ */
 
 /* draft-ietf-dnsext-delegation-signer-05.txt */
-#ifndef GENERIC_DLV_65323_H
-#define GENERIC_DLV_65323_H 1
+#ifndef GENERIC_DLV_32769_H
+#define GENERIC_DLV_32769_H 1
 
 typedef struct dns_rdata_dlv {
 	dns_rdatacommon_t	common;
@@ -1708,7 +1708,7 @@ typedef struct dns_rdata_dlv {
 	unsigned char		*digest;
 } dns_rdata_dlv_t;
 
-#endif /* GENERIC_DLV_65323_H */
+#endif /* GENERIC_DLV_32769_H */
 /*
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.