From: Mark Andrews <marka@isc.org>
Date: Tue, 21 Aug 2012 06:45:59 +0000 (+1000)
Subject: 3368.   [bug]           <dns/iptable.h> and <dns/zone.h> where not C++ safe.
X-Git-Tag: v9.7.7rc1~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd06dcf5fc5ee2ab7e806e56ee78771acf3801d1;p=thirdparty%2Fbind9.git

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

diff --git a/CHANGES b/CHANGES
index 618d6748fa0..b2f294f1ea2 100644
--- 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 d7eb140dc05..6662ecb8664 100644
--- 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 cdafc19f2ba..005c7fea0b7 100644
--- a/lib/dns/include/dns/zone.h
+++ b/lib/dns/include/dns/zone.h
@@ -1797,7 +1797,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.