3193. [cleanup] Changed MAXZONEKEYS to DNS_MAXZONEKEYS, moved to

			dnssec.h. [RT #26415]

diff --git a/CHANGES b/CHANGES
index dc9eff98066ae5f591bd9b74e2d7b1a4ddb0d232..b0b7d13529e30076e40d2914fbb0dbf38d8a7dfe 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3193.  [cleanup]       Changed MAXZONEKEYS to DNS_MAXZONEKEYS, moved to
+                       dnssec.h. [RT #26415]
+
 3192.  [bug]           A query structure could be used after being freed.
                        [RT #22208]
 

diff --git a/bin/named/update.c b/bin/named/update.c
index 03ed681ee4445da5d1499ab5b6d83180e8fdbcb2..684d72a4fe6a1df22524ddd04e07875cbbb58918 100644 (file)
--- a/bin/named/update.c
+++ b/bin/named/update.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: update.c,v 1.151.12.17 2011/08/31 07:47:56 marka Exp $ */
+/* $Id: update.c,v 1.151.12.18 2011/11/03 02:58:57 each Exp $ */
 
 #include <config.h>
 
@@ -1460,8 +1460,6 @@ check_soa_increment(dns_db_t *db, dns_dbversion_t *ver,
  * Incremental updating of NSECs and RRSIGs.
  */
 
-#define MAXZONEKEYS 32 /*%< Maximum number of zone keys supported. */
-
 /*%
  * We abuse the dns_diff_t type to represent a set of domain names
  * affected by the update.
@@ -2131,7 +2129,7 @@ update_signatures(ns_client_t *client, dns_zone_t *zone, dns_db_t *db,
        dns_diff_t nsec_diff;
        dns_diff_t nsec_mindiff;
        isc_boolean_t flag;
-       dst_key_t *zone_keys[MAXZONEKEYS];
+       dst_key_t *zone_keys[DNS_MAXZONEKEYS];
        unsigned int nkeys = 0;
        unsigned int i;
        isc_stdtime_t now, inception, expire;
@@ -2153,7 +2151,7 @@ update_signatures(ns_client_t *client, dns_zone_t *zone, dns_db_t *db,
        dns_diff_init(client->mctx, &nsec_mindiff);
 
        result = find_zone_keys(zone, db, newver, client->mctx,
-                               MAXZONEKEYS, zone_keys, &nkeys);
+                               DNS_MAXZONEKEYS, zone_keys, &nkeys);
        if (result != ISC_R_SUCCESS) {
                update_log(client, zone, ISC_LOG_ERROR,
                           "could not get zone keys for secure dynamic update");

diff --git a/lib/dns/include/dns/dnssec.h b/lib/dns/include/dns/dnssec.h
index 14462664a1ebba8ac9d900f4dcd38dbef8b22c97..fde491d520220922b53f1a2de41e2a5ad1cf7e92 100644 (file)
--- a/lib/dns/include/dns/dnssec.h
+++ b/lib/dns/include/dns/dnssec.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec.h,v 1.32.332.6 2009/06/22 23:47:18 tbox Exp $ */
+/* $Id: dnssec.h,v 1.32.332.7 2011/11/03 02:58:57 each Exp $ */
 
 #ifndef DNS_DNSSEC_H
 #define DNS_DNSSEC_H 1
@@ -31,6 +31,9 @@
 
 ISC_LANG_BEGINDECLS
 
+/*%< Maximum number of keys supported in a zone. */
+#define DNS_MAXZONEKEYS 32
+
 isc_result_t
 dns_dnssec_keyfromrdata(dns_name_t *name, dns_rdata_t *rdata, isc_mem_t *mctx,
                        dst_key_t **key);

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 9c79489a699c423d6ce84c4c540af621bf2a42ce..98d276f8cfa6babdb19704d7d76aff537410aca5 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.483.36.40 2011/09/05 07:19:25 each Exp $ */
+/* $Id: zone.c,v 1.483.36.41 2011/11/03 02:58:57 each Exp $ */
 
 /*! \file */
 
@@ -3542,8 +3542,6 @@ was_dumping(dns_zone_t *zone) {
        return (dumping);
 }
 
-#define MAXZONEKEYS 10
-
 static isc_result_t
 do_one_tuple(dns_difftuple_t **tuple, dns_db_t *db, dns_dbversion_t *ver,
             dns_diff_t *diff)
@@ -3916,7 +3914,7 @@ zone_resigninc(dns_zone_t *zone) {
        dns_name_t *name;
        dns_rdataset_t rdataset;
        dns_rdatatype_t covers;
-       dst_key_t *zone_keys[MAXZONEKEYS];
+       dst_key_t *zone_keys[DNS_MAXZONEKEYS];
        isc_boolean_t check_ksk;
        isc_result_t result;
        isc_stdtime_t now, inception, soaexpire, expire, stop;
@@ -3950,7 +3948,7 @@ zone_resigninc(dns_zone_t *zone) {
                goto failure;
        }
 
-       result = find_zone_keys(zone, db, version, zone->mctx, MAXZONEKEYS,
+       result = find_zone_keys(zone, db, version, zone->mctx, DNS_MAXZONEKEYS,
                                zone_keys, &nkeys);
        if (result != ISC_R_SUCCESS) {
                dns_zone_log(zone, ISC_LOG_ERROR,
@@ -4735,7 +4733,7 @@ zone_nsec3chain(dns_zone_t *zone) {
        dns_rdataset_t rdataset;
        dns_nsec3chain_t *nsec3chain = NULL, *nextnsec3chain;
        dns_nsec3chainlist_t cleanup;
-       dst_key_t *zone_keys[MAXZONEKEYS];
+       dst_key_t *zone_keys[DNS_MAXZONEKEYS];
        isc_int32_t signatures;
        isc_boolean_t check_ksk;
        isc_boolean_t delegation;
@@ -4787,7 +4785,7 @@ zone_nsec3chain(dns_zone_t *zone) {
        }
 
        result = find_zone_keys(zone, db, version, zone->mctx,
-                               MAXZONEKEYS, zone_keys, &nkeys);
+                               DNS_MAXZONEKEYS, zone_keys, &nkeys);
        if (result != ISC_R_SUCCESS) {
                dns_zone_log(zone, ISC_LOG_ERROR,
                             "zone_nsec3chain:find_zone_keys -> %s\n",
@@ -5525,7 +5523,7 @@ zone_sign(dns_zone_t *zone) {
        dns_rdataset_t rdataset;
        dns_signing_t *signing, *nextsigning;
        dns_signinglist_t cleanup;
-       dst_key_t *zone_keys[MAXZONEKEYS];
+       dst_key_t *zone_keys[DNS_MAXZONEKEYS];
        isc_int32_t signatures;
        isc_boolean_t check_ksk, is_ksk;
        isc_boolean_t commit = ISC_FALSE;
@@ -5571,7 +5569,7 @@ zone_sign(dns_zone_t *zone) {
        }
 
        result = find_zone_keys(zone, db, version, zone->mctx,
-                               MAXZONEKEYS, zone_keys, &nkeys);
+                               DNS_MAXZONEKEYS, zone_keys, &nkeys);
        if (result != ISC_R_SUCCESS) {
                dns_zone_log(zone, ISC_LOG_ERROR,
                             "zone_sign:find_zone_keys -> %s\n",