1985. [protocol] DLV has now been assigned a official type code of

                        32769. [RT #15807]

diff --git a/CHANGES b/CHANGES
index ea7776d411c9e1f7be1093c90e849b22cf0a05d1..914bf3ce0a463da789af2830729d267da65bb21a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,14 @@
+1985.  [protocol]      DLV has now been assigned a official type code of
+                       32769. [RT #15807]
+
+                       Note: care should be taken to ensure you upgrade
+                       both named and dnssec-signzone at the same time for
+                       zones with DLV records where named is the master
+                       server for the zone.  Also any zones that contain
+                       DLV records should be removed when upgrading a slave
+                       zone.  You do not however have to upgrade all
+                       servers for a zone with DLV records simultaniously.
+
 1984.  [func]          dig, nslookup and host now advertise a 4096 byte
                        EDNS UDP buffer size by default. [RT #15855]
 

diff --git a/lib/dns/rdata/generic/dlv_65323.c b/lib/dns/rdata/generic/dlv_32769.c
similarity index 91%
rename from lib/dns/rdata/generic/dlv_65323.c
rename to lib/dns/rdata/generic/dlv_32769.c
index 1cc472522966a9e17e59609c315c6209f6c1aa95..2f838795900c202ac53aba249510d35b99679148 100644 (file)
--- a/lib/dns/rdata/generic/dlv_65323.c
+++ b/lib/dns/rdata/generic/dlv_32769.c
@@ -14,12 +14,12 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dlv_65323.c,v 1.4 2004/03/18 02:58:04 marka Exp $ */
+/* $Id: dlv_32769.c,v 1.2 2006/02/17 01:04:14 marka Exp $ */
 
 /* draft-ietf-dnsext-delegation-signer-05.txt */
 
-#ifndef RDATA_GENERIC_DLV_65323_C
-#define RDATA_GENERIC_DLV_65323_C
+#ifndef RDATA_GENERIC_DLV_32769_C
+#define RDATA_GENERIC_DLV_32769_C
 
 #define RRTYPE_DLV_ATTRIBUTES 0
 
@@ -27,7 +27,7 @@ static inline isc_result_t
 fromtext_dlv(ARGS_FROMTEXT) {
        isc_token_t token;
 
-       REQUIRE(type == 65323);
+       REQUIRE(type == 32769);
 
        UNUSED(type);
        UNUSED(rdclass);
@@ -75,7 +75,7 @@ totext_dlv(ARGS_TOTEXT) {
        char buf[sizeof("64000 ")];
        unsigned int n;
 
-       REQUIRE(rdata->type == 65323);
+       REQUIRE(rdata->type == 32769);
        REQUIRE(rdata->length != 0);
 
        UNUSED(tctx);
@@ -122,7 +122,7 @@ static inline isc_result_t
 fromwire_dlv(ARGS_FROMWIRE) {
        isc_region_t sr;
 
-       REQUIRE(type == 65323);
+       REQUIRE(type == 32769);
 
        UNUSED(type);
        UNUSED(rdclass);
@@ -141,7 +141,7 @@ static inline isc_result_t
 towire_dlv(ARGS_TOWIRE) {
        isc_region_t sr;
 
-       REQUIRE(rdata->type == 65323);
+       REQUIRE(rdata->type == 32769);
        REQUIRE(rdata->length != 0);
 
        UNUSED(cctx);
@@ -157,7 +157,7 @@ compare_dlv(ARGS_COMPARE) {
 
        REQUIRE(rdata1->type == rdata2->type);
        REQUIRE(rdata1->rdclass == rdata2->rdclass);
-       REQUIRE(rdata1->type == 65323);
+       REQUIRE(rdata1->type == 32769);
        REQUIRE(rdata1->length != 0);
        REQUIRE(rdata2->length != 0);
 
@@ -170,7 +170,7 @@ static inline isc_result_t
 fromstruct_dlv(ARGS_FROMSTRUCT) {
        dns_rdata_dlv_t *dlv = source;
 
-       REQUIRE(type == 65323);
+       REQUIRE(type == 32769);
        REQUIRE(source != NULL);
        REQUIRE(dlv->common.rdtype == type);
        REQUIRE(dlv->common.rdclass == rdclass);
@@ -190,7 +190,7 @@ tostruct_dlv(ARGS_TOSTRUCT) {
        dns_rdata_dlv_t *dlv = target;
        isc_region_t region;
 
-       REQUIRE(rdata->type == 65323);
+       REQUIRE(rdata->type == 32769);
        REQUIRE(target != NULL);
        REQUIRE(rdata->length != 0);
 
@@ -221,7 +221,7 @@ freestruct_dlv(ARGS_FREESTRUCT) {
        dns_rdata_dlv_t *dlv = source;
 
        REQUIRE(dlv != NULL);
-       REQUIRE(dlv->common.rdtype == 65323);
+       REQUIRE(dlv->common.rdtype == 32769);
 
        if (dlv->mctx == NULL)
                return;
@@ -233,7 +233,7 @@ freestruct_dlv(ARGS_FREESTRUCT) {
 
 static inline isc_result_t
 additionaldata_dlv(ARGS_ADDLDATA) {
-       REQUIRE(rdata->type == 65323);
+       REQUIRE(rdata->type == 32769);
 
        UNUSED(rdata);
        UNUSED(add);
@@ -246,7 +246,7 @@ static inline isc_result_t
 digest_dlv(ARGS_DIGEST) {
        isc_region_t r;
 
-       REQUIRE(rdata->type == 65323);
+       REQUIRE(rdata->type == 32769);
 
        dns_rdata_toregion(rdata, &r);
 
@@ -256,7 +256,7 @@ digest_dlv(ARGS_DIGEST) {
 static inline isc_boolean_t
 checkowner_dlv(ARGS_CHECKOWNER) {
 
-       REQUIRE(type == 65323);
+       REQUIRE(type == 32769);
 
        UNUSED(name);
        UNUSED(type);
@@ -269,7 +269,7 @@ checkowner_dlv(ARGS_CHECKOWNER) {
 static inline isc_boolean_t
 checknames_dlv(ARGS_CHECKNAMES) {
 
-       REQUIRE(rdata->type == 65323);
+       REQUIRE(rdata->type == 32769);
 
        UNUSED(rdata);
        UNUSED(owner);
@@ -278,4 +278,4 @@ checknames_dlv(ARGS_CHECKNAMES) {
        return (ISC_TRUE);
 }
 
-#endif /* RDATA_GENERIC_DLV_65323_C */
+#endif /* RDATA_GENERIC_DLV_32769_C */

diff --git a/lib/dns/rdata/generic/dlv_65323.h b/lib/dns/rdata/generic/dlv_32769.h
similarity index 87%
rename from lib/dns/rdata/generic/dlv_65323.h
rename to lib/dns/rdata/generic/dlv_32769.h
index 90f3b137956eea09ddf6cdb65b632a8d0e5df16d..acffe29d80d9b3908505bfb8c72f82d4e1bf2f37 100644 (file)
--- a/lib/dns/rdata/generic/dlv_65323.h
+++ b/lib/dns/rdata/generic/dlv_32769.h
@@ -14,11 +14,11 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dlv_65323.h,v 1.3 2004/03/16 05:22:31 marka Exp $ */
+/* $Id: dlv_32769.h,v 1.2 2006/02/17 01:04:14 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;
@@ -30,4 +30,4 @@ typedef struct dns_rdata_dlv {
        unsigned char           *digest;
 } dns_rdata_dlv_t;
 
-#endif /* GENERIC_DLV_65323_H */
+#endif /* GENERIC_DLV_32769_H */

diff --git a/util/copyrights b/util/copyrights
index c7b51a18879f2e9c7b6f30cbd57958fa94aca67c..f70bead5feffaba2b5f14d6feaf88c9649e639f0 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -1822,8 +1822,8 @@
 ./lib/dns/rdata/generic/cert_37.h              C       1999,2000,2001,2004,2005
 ./lib/dns/rdata/generic/cname_5.c              C       1998,1999,2000,2001,2004
 ./lib/dns/rdata/generic/cname_5.h              C       1998,1999,2000,2001,2004
-./lib/dns/rdata/generic/dlv_65323.c            C       2004
-./lib/dns/rdata/generic/dlv_65323.h            C       2004
+./lib/dns/rdata/generic/dlv_32769.c            C       2004
+./lib/dns/rdata/generic/dlv_32769.h            C       2004
 ./lib/dns/rdata/generic/dname_39.c             C       1999,2000,2001,2004
 ./lib/dns/rdata/generic/dname_39.h             C       1999,2000,2001,2004,2005
 ./lib/dns/rdata/generic/dnskey_48.c            C       2003,2004,2005