3607. [bug] dnssec-keygen had broken 'Invalid keyfile' error

                        message. [RT #34045]

diff --git a/CHANGES b/CHANGES
index eabaa163a4459741e8881d5a8b9278675b8700bd..9cd2629fff198d32429e3914c97d5d3c246ca528 100644 (file)
--- 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 3d22f997cc2d690b3af408c9f552ff8495e3a6ad..9e53674e024bc5995c6286980a16b1ad9cb5a1ff 100644 (file)
--- 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);