3836. [bug] Address C++ keyword usage in header file.

diff --git a/CHANGES b/CHANGES
index 34d7449cce9a32e5fde18ca98c0034967c818383..0e6cd33cfe25222cbb1630bf99327352cb7eb5f7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3836.  [bug]           Address C++ keyword usage in header file.
+
 3835.  [bug]           Geoip ACL elements didn't work correctly when
                        referenced via named or nested ACLs. [RT #35879]
 

diff --git a/lib/dns/dnssec.c b/lib/dns/dnssec.c
index 638ed1bf5a8e8ddeff494f67f0bdd7c2da9b7b2e..68954e97e9533503401ef95d186c3d083e15709f 100644 (file)
--- a/lib/dns/dnssec.c
+++ b/lib/dns/dnssec.c
@@ -1526,7 +1526,7 @@ dns_dnssec_keylistfromrdataset(dns_name_t *origin,
                               const char *directory, isc_mem_t *mctx,
                               dns_rdataset_t *keyset, dns_rdataset_t *keysigs,
                               dns_rdataset_t *soasigs, isc_boolean_t savekeys,
-                              isc_boolean_t public,
+                              isc_boolean_t publickey,
                               dns_dnsseckeylist_t *keylist)
 {
        dns_rdataset_t keys;
@@ -1555,7 +1555,7 @@ dns_dnssec_keylistfromrdataset(dns_name_t *origin,
                if (!dns_name_equal(origin, dst_key_name(pubkey)))
                        goto skip;
 
-               if (public) {
+               if (publickey) {
                        RETERR(addkey(keylist, &pubkey, savekeys, mctx));
                        goto skip;
                }

diff --git a/lib/dns/include/dns/dnssec.h b/lib/dns/include/dns/dnssec.h
index 7202d99b5da94430f8eac4305996f964b5976e38..1b187dd1212cfa75a62b9b085defa161c9ef5c12 100644 (file)
--- a/lib/dns/include/dns/dnssec.h
+++ b/lib/dns/include/dns/dnssec.h
@@ -314,11 +314,11 @@ dns_dnssec_keylistfromrdataset(dns_name_t *origin,
                               const char *directory, isc_mem_t *mctx,
                               dns_rdataset_t *keyset, dns_rdataset_t *keysigs,
                               dns_rdataset_t *soasigs, isc_boolean_t savekeys,
-                              isc_boolean_t public,
+                              isc_boolean_t publickey,
                               dns_dnsseckeylist_t *keylist);
 /*%<
  * Append the contents of a DNSKEY rdataset 'keyset' to 'keylist'.
- * Omit duplicates.  If 'public' is ISC_FALSE, search 'directory' for
+ * Omit duplicates.  If 'publickey' is ISC_FALSE, search 'directory' for
  * matching key files, and load the private keys that go with
  * the public ones.  If 'savekeys' is ISC_TRUE, mark the keys so
  * they will not be deleted or inactivated regardless of metadata.