Spelling error! Rename NSEC3PARAMS into NSEC3PARAM.

diff --git a/dnssec.c b/dnssec.c
index 0494b92a597fcdf705a0646d25580d5a21cca2c3..7a6aaf9c7532a968e1ec16bd8939ab67f37dafec 100644 (file)
--- a/dnssec.c
+++ b/dnssec.c
@@ -1201,7 +1201,7 @@ ldns_nsec3_algorithm(const ldns_rr *nsec3_rr)
 {
        if (nsec3_rr && 
              (ldns_rr_get_type(nsec3_rr) == LDNS_RR_TYPE_NSEC3 ||
-              ldns_rr_get_type(nsec3_rr) == LDNS_RR_TYPE_NSEC3PARAMS)
+              ldns_rr_get_type(nsec3_rr) == LDNS_RR_TYPE_NSEC3PARAM)
            && ldns_rdf_size(ldns_rr_rdf(nsec3_rr, 0)) > 0
            ) {
                return ldns_rdf2native_int8(ldns_rr_rdf(nsec3_rr, 0));
@@ -1214,7 +1214,7 @@ ldns_nsec3_flags(const ldns_rr *nsec3_rr)
 {
        if (nsec3_rr && 
              (ldns_rr_get_type(nsec3_rr) == LDNS_RR_TYPE_NSEC3 ||
-              ldns_rr_get_type(nsec3_rr) == LDNS_RR_TYPE_NSEC3PARAMS)
+              ldns_rr_get_type(nsec3_rr) == LDNS_RR_TYPE_NSEC3PARAM)
            && ldns_rdf_size(ldns_rr_rdf(nsec3_rr, 1)) > 0
            ) {
                return ldns_rdf2native_int8(ldns_rr_rdf(nsec3_rr, 1));
@@ -1233,7 +1233,7 @@ ldns_nsec3_iterations(const ldns_rr *nsec3_rr)
 {
        if (nsec3_rr &&
              (ldns_rr_get_type(nsec3_rr) == LDNS_RR_TYPE_NSEC3 ||
-              ldns_rr_get_type(nsec3_rr) == LDNS_RR_TYPE_NSEC3PARAMS)
+              ldns_rr_get_type(nsec3_rr) == LDNS_RR_TYPE_NSEC3PARAM)
            && ldns_rdf_size(ldns_rr_rdf(nsec3_rr, 2)) > 0
            ) {
                return ldns_rdf2native_int16(ldns_rr_rdf(nsec3_rr, 2));
@@ -1247,7 +1247,7 @@ ldns_nsec3_salt(const ldns_rr *nsec3_rr)
 {
        if (nsec3_rr && 
              (ldns_rr_get_type(nsec3_rr) == LDNS_RR_TYPE_NSEC3 ||
-              ldns_rr_get_type(nsec3_rr) == LDNS_RR_TYPE_NSEC3PARAMS)
+              ldns_rr_get_type(nsec3_rr) == LDNS_RR_TYPE_NSEC3PARAM)
            ) {
                return ldns_rr_rdf(nsec3_rr, 3);
        }

diff --git a/dnssec_sign.c b/dnssec_sign.c
index b21094465fe91fd32785b74cbfbd36182c355ed2..78b3ef6b4fbecdc83e845d2c00609269a51a0fd7 100644 (file)
--- a/dnssec_sign.c
+++ b/dnssec_sign.c
@@ -1109,7 +1109,7 @@ ldns_dnssec_zone_sign_nsec3_flg(ldns_dnssec_zone *zone,
                                           uint8_t *salt,
                                           int signflags)
 {
-       ldns_rr *nsec3, *nsec3params;
+       ldns_rr *nsec3, *nsec3param;
        ldns_status result = LDNS_STATUS_OK;
 
        /* zone is already sorted */
@@ -1134,13 +1134,13 @@ ldns_dnssec_zone_sign_nsec3_flg(ldns_dnssec_zone *zone,
                } else {
                        if (!ldns_dnssec_zone_find_rrset(zone,
                                                                           zone->soa->name,
-                                                                          LDNS_RR_TYPE_NSEC3PARAMS)) {
-                               /* create and add the nsec3params rr */
-                               nsec3params =
-                                       ldns_rr_new_frm_type(LDNS_RR_TYPE_NSEC3PARAMS);
-                               ldns_rr_set_owner(nsec3params,
+                                                                          LDNS_RR_TYPE_NSEC3PARAM)) {
+                               /* create and add the nsec3param rr */
+                               nsec3param =
+                                       ldns_rr_new_frm_type(LDNS_RR_TYPE_NSEC3PARAM);
+                               ldns_rr_set_owner(nsec3param,
                                                           ldns_rdf_clone(zone->soa->name));
-                               ldns_nsec3_add_param_rdfs(nsec3params,
+                               ldns_nsec3_add_param_rdfs(nsec3param,
                                                                         algorithm,
                                                                         flags,
                                                                         iterations,
@@ -1148,12 +1148,12 @@ ldns_dnssec_zone_sign_nsec3_flg(ldns_dnssec_zone *zone,
                                                                         salt);
                                /* always set bit 7 of the flags to zero, according to
                                 * rfc5155 section 11 */
-                               ldns_set_bit(ldns_rdf_data(ldns_rr_rdf(nsec3params, 1)), 7, 0);
-                               result = ldns_dnssec_zone_add_rr(zone, nsec3params);
+                               ldns_set_bit(ldns_rdf_data(ldns_rr_rdf(nsec3param, 1)), 7, 0);
+                               result = ldns_dnssec_zone_add_rr(zone, nsec3param);
                                if (result != LDNS_STATUS_OK) {
                                        return result;
                                }
-                               ldns_rr_list_push_rr(new_rrs, nsec3params);
+                               ldns_rr_list_push_rr(new_rrs, nsec3param);
                        }
                        result = ldns_dnssec_zone_create_nsec3s(zone,
                                                                                        new_rrs,

diff --git a/examples/ldns-read-zone.c b/examples/ldns-read-zone.c
index ea35850fc1f1bacf2ede536d9ef9cd6880d6aa81..4a1137e8d23df4c39911e3bc31cf8020f2a55cf2 100644 (file)
--- a/examples/ldns-read-zone.c
+++ b/examples/ldns-read-zone.c
@@ -102,7 +102,7 @@ main(int argc, char **argv)
                        if (cur_rr_type == LDNS_RR_TYPE_RRSIG ||
                            cur_rr_type == LDNS_RR_TYPE_NSEC ||
                            cur_rr_type == LDNS_RR_TYPE_NSEC3 ||
-                           cur_rr_type == LDNS_RR_TYPE_NSEC3PARAMS
+                           cur_rr_type == LDNS_RR_TYPE_NSEC3PARAM
                           ) {
                                ldns_rr_free(cur_rr);
                        } else {
@@ -119,7 +119,7 @@ main(int argc, char **argv)
                        if (cur_rr_type == LDNS_RR_TYPE_RRSIG ||
                            cur_rr_type == LDNS_RR_TYPE_NSEC ||
                            cur_rr_type == LDNS_RR_TYPE_NSEC3 ||
-                           cur_rr_type == LDNS_RR_TYPE_NSEC3PARAMS
+                           cur_rr_type == LDNS_RR_TYPE_NSEC3PARAM
                           ) {
                                ldns_rr_list_push_rr(stripped_list, cur_rr);
                        } else {

diff --git a/ldns/rr.h b/ldns/rr.h
index 86e31de1f2435579bcc603a4c4eae1f0d1a6e2a1..2e1dd76b48f20d42114d0c36d427f70716264f61 100644 (file)
--- a/ldns/rr.h
+++ b/ldns/rr.h
@@ -176,6 +176,7 @@ enum ldns_enum_rr_type
        LDNS_RR_TYPE_DHCID = 49,
 
        LDNS_RR_TYPE_NSEC3 = 50,
+       LDNS_RR_TYPE_NSEC3PARAM = 51,
        LDNS_RR_TYPE_NSEC3PARAMS = 51,
 
         /** draft-ietf-dnsop-trust-history */

diff --git a/rr.c b/rr.c
index 7b799b9b56551e5b8fc2cb7321289aa6dda51440..9d47aa655df77a2d54270b1f837e4c16a6823dda 100644 (file)
--- a/rr.c
+++ b/rr.c
@@ -1900,7 +1900,7 @@ static const ldns_rdf_type type_nsec3_wireformat[] = {
        LDNS_RDF_TYPE_INT8, LDNS_RDF_TYPE_INT8, LDNS_RDF_TYPE_INT16, LDNS_RDF_TYPE_NSEC3_SALT, LDNS_RDF_TYPE_NSEC3_NEXT_OWNER, LDNS_RDF_TYPE_NSEC
 };
 
-static const ldns_rdf_type type_nsec3params_wireformat[] = {
+static const ldns_rdf_type type_nsec3param_wireformat[] = {
 /*     LDNS_RDF_TYPE_NSEC3_PARAMS_VARS*/
        LDNS_RDF_TYPE_INT8,
        LDNS_RDF_TYPE_INT8,
@@ -2034,7 +2034,7 @@ static ldns_rr_descriptor rdata_field_descriptors[] = {
        /* 50 */
        {LDNS_RR_TYPE_NSEC3, "NSEC3", 5, 6, type_nsec3_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
        /* 51 */
-{LDNS_RR_TYPE_NSEC3PARAMS, "NSEC3PARAM", 4, 4, type_nsec3params_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
+{LDNS_RR_TYPE_NSEC3PARAM, "NSEC3PARAM", 4, 4, type_nsec3param_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
        /* 52 */
 {LDNS_RR_TYPE_NULL, "TYPE52", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
 {LDNS_RR_TYPE_NULL, "TYPE53", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },