From: Mark Andrews <marka@isc.org>
Date: Tue, 21 Jul 2009 07:29:23 +0000 (+0000)
Subject: 2639.   [bug]           Silence compiler warnings in gssapi code. [RT #19954]
X-Git-Tag: v9.5.2b1~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=086467312c8b2ac2bd6bc92cae77cdcad38f4d12;p=thirdparty%2Fbind9.git

2639.   [bug]           Silence compiler warnings in gssapi code. [RT #19954]
---

diff --git a/CHANGES b/CHANGES
index 7029af8dd8d..b3ae949bc2c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2639.	[bug]		Silence compiler warnings in gssapi code. [RT #19954]
+
 2637.	[func]		Rationalize dnssec-signzone's signwithkey() calling.
 			[RT #19959]
 
diff --git a/lib/dns/spnego.c b/lib/dns/spnego.c
index 7c99201e99f..0233a2babdd 100644
--- a/lib/dns/spnego.c
+++ b/lib/dns/spnego.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: spnego.c,v 1.5.128.6 2009/07/20 01:56:05 marka Exp $ */
+/* $Id: spnego.c,v 1.5.128.7 2009/07/21 07:29:23 marka Exp $ */
 
 /*! \file
  * \brief
@@ -265,8 +265,7 @@ decode_oid(const unsigned char *p, size_t len,
 	   oid * k, size_t * size);
 
 static int
-decode_enumerated(const unsigned char *p, size_t len,
-		  unsigned *num, size_t *size);
+decode_enumerated(const unsigned char *p, size_t len, void *num, size_t *size);
 
 static int
 decode_octet_string(const unsigned char *, size_t, octet_string *, size_t *);
@@ -291,8 +290,7 @@ der_put_length_and_tag(unsigned char *, size_t, size_t,
 		       Der_class, Der_type, int, size_t *);
 
 static int
-encode_enumerated(unsigned char *p, size_t len,
-		  const unsigned *data, size_t *);
+encode_enumerated(unsigned char *p, size_t len, const void *data, size_t *);
 
 static int
 encode_octet_string(unsigned char *p, size_t len,
@@ -956,8 +954,7 @@ der_match_tag_and_length(const unsigned char *p, size_t len,
 }
 
 static int
-decode_enumerated(const unsigned char *p, size_t len,
-		  unsigned *num, size_t *size)
+decode_enumerated(const unsigned char *p, size_t len, void *num, size_t *size)
 {
 	size_t ret = 0;
 	size_t l, reallen;
@@ -1269,10 +1266,9 @@ der_put_length_and_tag(unsigned char *p, size_t len, size_t len_val,
 }
 
 static int
-encode_enumerated(unsigned char *p, size_t len, const unsigned *data,
-		  size_t *size)
+encode_enumerated(unsigned char *p, size_t len, const void *data, size_t *size)
 {
-	unsigned num = *data;
+	unsigned num = *(const unsigned *)data;
 	size_t ret = 0;
 	size_t l;
 	int e;