upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-09 03:32:06 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Mark Andrews 2014-05-02 11:34:32 +10:00
parent c25d9da3f1
commit dd820d8fd2
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGES
View file

@ -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]

4
lib/dns/dnssec.c
View file

@ -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;
}

4
lib/dns/include/dns/dnssec.h
View file

@ -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.