3368. [bug] <dns/iptable.h> and <dns/zone.h> where not C++ safe.

diff --git a/CHANGES b/CHANGES
index c03711fe6886fd0b283abc2106394ea623c39816..afd5ab91a4a7fd5e1646bdd81157da4377f90e8a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3368.  [bug]           <dns/iptable.h> and <dns/zone.h> where not C++ safe.
+
 3367.  [bug]           dns_dnsseckey_create() result was not being checked.
                        [RT #30685]
 

diff --git a/lib/dns/include/dns/iptable.h b/lib/dns/include/dns/iptable.h
index d7eb140dc057a25f6c4c23a28388ceb9196fc58f..6662ecb8664b49d221080dc00445610c87aee3c2 100644 (file)
--- a/lib/dns/include/dns/iptable.h
+++ b/lib/dns/include/dns/iptable.h
@@ -23,6 +23,8 @@
 #include <isc/magic.h>
 #include <isc/radix.h>
 
+#include <dns/types.h>
+
 struct dns_iptable {
        unsigned int            magic;
        isc_mem_t               *mctx;

diff --git a/lib/dns/include/dns/zone.h b/lib/dns/include/dns/zone.h
index 9eada5908ca9cfb4873a6bb4b649660a8bd3309c..9db825cb09ea354116a59309611eda928f70e841 100644 (file)
--- a/lib/dns/include/dns/zone.h
+++ b/lib/dns/include/dns/zone.h
@@ -1815,7 +1815,7 @@ dns_zone_setsignatures(dns_zone_t *zone, isc_uint32_t signatures);
 
 isc_result_t
 dns_zone_signwithkey(dns_zone_t *zone, dns_secalg_t algorithm,
-                    isc_uint16_t keyid, isc_boolean_t delete);
+                    isc_uint16_t keyid, isc_boolean_t deleteit);
 /*%<
  * Initiate/resume signing of the entire zone with the zone DNSKEY(s)
  * that match the given algorithm and keyid.