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.8.6rc1~22
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=657db9838bf43f40d3c22f22dd35cad87174cb6e;p=thirdparty%2Fbind9.git

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

diff --git a/CHANGES b/CHANGES
index eabaa163a44..9cd2629fff1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3607.	[bug]		dnssec-keygen had broken 'Invalid keyfile' error
+			message. [RT #34045]
+
 	--- 9.8.6b1 released ---
 
 3605.	[port]		win32: Addressed several compatibility issues
diff --git a/bin/dnssec/dnssec-keygen.c b/bin/dnssec/dnssec-keygen.c
index 3d22f997cc2..9e53674e024 100644
--- a/bin/dnssec/dnssec-keygen.c
+++ b/bin/dnssec/dnssec-keygen.c
@@ -646,9 +646,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);