From e68de4a7dbf5b6a1b2ff3f4f4dd8adf80b80525b Mon Sep 17 00:00:00 2001
From: Brian Wellington <source@isc.org>
Date: Mon, 3 Jul 2000 23:27:45 +0000
Subject: [PATCH]  306. [bug]             Reading HMAC-MD5 private key files
 didn't work.

---
 CHANGES                     | 2 ++
 lib/dns/sec/dst/hmac_link.c | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index b160ba5501..cb8a8e43b3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+ 306. [bug] 		Reading HMAC-MD5 private key files didn't work.
+
  305. [bug] 		When reloading the server with a config file 
 			containing a syntax error, it could catch an
 			assertion failure trying to perform zone
diff --git a/lib/dns/sec/dst/hmac_link.c b/lib/dns/sec/dst/hmac_link.c
index 9d34d15637..6471cbb925 100644
--- a/lib/dns/sec/dst/hmac_link.c
+++ b/lib/dns/sec/dst/hmac_link.c
@@ -19,7 +19,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: hmac_link.c,v 1.38 2000/06/12 18:05:12 bwelling Exp $
+ * $Id: hmac_link.c,v 1.39 2000/07/03 23:27:45 bwelling Exp $
  */
 
 #include <config.h>
@@ -270,9 +270,10 @@ hmacmd5_fromfile(dst_key_t *key, const isc_uint16_t id, const char *filename) {
 
 	isc_buffer_init(&b, priv.elements[0].data, priv.elements[0].length);
 	isc_buffer_add(&b, priv.elements[0].length);
+	ret = hmacmd5_fromdns(key, &b);
 	dst__privstruct_free(&priv, mctx);
 	memset(&priv, 0, sizeof(priv));
-	return (hmacmd5_fromdns(key, &b));
+	return (ret);
 }
 
 static dst_func_t hmacmd5_functions = {