From: Thomas Markwalder <tmark@isc.org>
Date: Wed, 5 Nov 2014 18:48:40 +0000 (-0500)
Subject: [master] Fixes compilation error in dst_api.c
X-Git-Tag: v4_3_2.pre-beta~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6444928cf5788ced056e39a27142a14e61b0a816;p=thirdparty%2Fdhcp.git

[master] Fixes compilation error in dst_api.c

    Merger in rt37708.
---

diff --git a/RELNOTES b/RELNOTES
index aad275320..a4c36129f 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -77,8 +77,10 @@ by Eric Young (eay@cryptsoft.com).
   [ISC-Bugs #36671]
 
 - Addressed Coverity issues reported as of 07-31-2014:
-  [ISC-Bugs #36712] Corrects Coverity reported "high" impact issues
+  [ISC-Bugs #36712] Corrects Coverity reported "high" impact issues.
   [ISC-Bugs #36933] Corrects Coverity reported "medium" impact issues
+  [ISC-Bugs #37708] Fixes compilation error in dst_api.c seen in older
+  compilers that was introduced by #36712
 
 - Server now supports a failover split value of 256.
   [ISC-Bugs] #36664]
diff --git a/dst/dst_api.c b/dst/dst_api.c
index 30dc66f5e..a77abd2d7 100644
--- a/dst/dst_api.c
+++ b/dst/dst_api.c
@@ -66,7 +66,7 @@ const char *dst_path = "";
 /* internal I/O functions */
 static DST_KEY *dst_s_read_public_key(const char *in_name, 
 				      const unsigned in_id, int in_alg);
-static int dst_s_read_private_key_file(char *name, DST_KEY *pk_key,
+static int dst_s_read_private_key_file(const char *name, DST_KEY *pk_key,
 				       unsigned in_id, int in_alg);
 static int dst_s_write_public_key(const DST_KEY *key);
 static int dst_s_write_private_key(const DST_KEY *key);
@@ -365,7 +365,7 @@ dst_read_key(const char *in_keyname, const unsigned in_id,
 					    0)))
 		return (dg_key);
 	/* Fill in private key and some fields in the general key structure */
-	if (dst_s_read_private_key_file((char *)(in_keyname), dg_key, pubkey->dk_id,
+	if (dst_s_read_private_key_file(in_keyname, dg_key, pubkey->dk_id,
 					pubkey->dk_alg) == 0)
 		dg_key = dst_free_key(dg_key);
 
@@ -843,7 +843,7 @@ dst_key_to_buffer(DST_KEY *key, u_char *out_buff, unsigned buf_len)
  */
 
 static int
-dst_s_read_private_key_file(char *name, DST_KEY *pk_key, unsigned in_id,
+dst_s_read_private_key_file(const char *name, DST_KEY *pk_key, unsigned in_id,
 			    int in_alg)
 {
 	int cnt, alg, len, major, minor, file_major, file_minor;