From: Mark Andrews <marka@isc.org>
Date: Wed, 3 Jul 2013 05:41:48 +0000 (+1000)
Subject: 3607.   [bug]           dnssec-keygen had broken 'Invalid keyfile' error
X-Git-Tag: v9.10.0a1~244
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=9d69017bc635f7be5c8df2b18ae6d4491fc5bb63;p=thirdparty%2Fbind9.git

3607.   [bug]           dnssec-keygen had broken 'Invalid keyfile' error
                        message. [RT #34045]
---

diff --git a/CHANGES b/CHANGES
index 5bc74b5ce92..97c55be41c3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3607.	[bug]		dnssec-keygen had broken 'Invalid keyfile' error
+			message. [RT #34045]
+
 3606.	[func]		"rndc flushtree" now flushes matching
 			records in the address database and bad cache
                         as well as the DNS cache. (Previously only the
diff --git a/bin/dnssec/dnssec-keygen.c b/bin/dnssec/dnssec-keygen.c
index 1e61ca392e8..706182977e2 100644
--- a/bin/dnssec/dnssec-keygen.c
+++ b/bin/dnssec/dnssec-keygen.c
@@ -655,9 +655,9 @@ main(int argc, char **argv) {
 					    mctx, &prevkey);
 		if (ret != ISC_R_SUCCESS)
 			fatal("Invalid keyfile %s: %s",
-			      filename, isc_result_totext(ret));
+			      predecessor, isc_result_totext(ret));
 		if (!dst_key_isprivate(prevkey))
-			fatal("%s is not a private key", filename);
+			fatal("%s is not a private key", predecessor);
 
 		name = dst_key_name(prevkey);
 		alg = dst_key_alg(prevkey);