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

                        message. [RT #34045]

diff --git a/CHANGES b/CHANGES
index 5bc74b5ce920368df800af4ea26c30bc14df00cf..97c55be41c3bbf077463f112a5f123b2753a5214 100644 (file)
--- 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 1e61ca392e8600a7b4ef0e0c8f47f132bbfb68f1..706182977e2834187fb73455cd81b721ab14d0ca 100644 (file)
--- 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);