From: Mark Andrews <marka@isc.org>
Date: Thu, 7 Mar 2013 07:44:45 +0000 (+1100)
Subject: 3518.   [bug]           Increase the size of dns_rrl_key.s.rtype by one bit
X-Git-Tag: v9.10.0a1~448^2~94
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=af21fc66447083a01e41e533fe9737ffcf21cc2d;p=thirdparty%2Fbind9.git

3518.   [bug]           Increase the size of dns_rrl_key.s.rtype by one bit
                        so that all dns_rrl_rtype_t enum values fit regardless
                        of whether it is teated as signed or unsigned by
                        the compiler. [RT #32792]
---

diff --git a/CHANGES b/CHANGES
index aeaea88166f..a102e7e62a2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+3518.	[bug]		Increase the size of dns_rrl_key.s.rtype by one bit
+			so that all dns_rrl_rtype_t enum values fit regardless
+			of whether it is teated as signed or unsigned by
+			the compiler. [RT #32792]
+
 3517.	[bug]		Reorder destruction to avoid shutdown race. [RT #32777]
 
 3516.	[placeholder]
diff --git a/lib/dns/include/dns/rrl.h b/lib/dns/include/dns/rrl.h
index 83c1655bb58..d6974b7387d 100644
--- a/lib/dns/include/dns/rrl.h
+++ b/lib/dns/include/dns/rrl.h
@@ -95,7 +95,7 @@ union dns_rrl_key {
 		isc_uint32_t	    qname_hash;
 		dns_rdatatype_t	    qtype;
 		isc_uint8_t	    qclass;
-		dns_rrl_rtype_t	    rtype   :3;
+		dns_rrl_rtype_t	    rtype   :4; /* 3 bits + sign bit */
 		isc_boolean_t	    ipv6    :1;
 	} s;
 	isc_uint16_t	w[1];