pullup:

Improve error messages printed by dnssec tools when compiled
without crypto support (patch from Olafur)

diff --git a/bin/dnssec/dnssec-keygen.c b/bin/dnssec/dnssec-keygen.c
index 3306460a7001d37e2f902c214d5979a644aad7f9..80ef4ce6825ca3f48b3452c21abd0b411ebb5f48 100644 (file)
--- a/bin/dnssec/dnssec-keygen.c
+++ b/bin/dnssec/dnssec-keygen.c
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-keygen.c,v 1.48 2001/07/10 18:53:09 bwelling Exp $ */
+/* $Id: dnssec-keygen.c,v 1.48.2.1 2001/10/05 00:21:44 bwelling Exp $ */
 
 #include <config.h>
 
@@ -40,7 +40,6 @@
 #include <dns/secalg.h>
 
 #include <dst/dst.h>
-#include <dst/result.h>
 
 #include "dnssectool.h"
 
@@ -342,7 +341,7 @@ main(int argc, char **argv) {
                        dns_name_format(name, namestr, sizeof namestr);
                        alg_format(alg, algstr, sizeof algstr);
                        fatal("failed to generate key %s/%s: %s\n",
-                             namestr, algstr, dst_result_totext(ret));
+                             namestr, algstr, isc_result_totext(ret));
                        exit(-1);
                }
 

diff --git a/bin/dnssec/dnssec-makekeyset.c b/bin/dnssec/dnssec-makekeyset.c
index 12c5c8d5f6146a20c626327e5856b1dabb09577a..7bf539e27868075712758e1cf90962aaa2097cca 100644 (file)
--- a/bin/dnssec/dnssec-makekeyset.c
+++ b/bin/dnssec/dnssec-makekeyset.c
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-makekeyset.c,v 1.52 2001/05/10 06:04:56 bwelling Exp $ */
+/* $Id: dnssec-makekeyset.c,v 1.52.2.1 2001/10/05 00:21:45 bwelling Exp $ */
 
 #include <config.h>
 
@@ -214,7 +214,8 @@ main(int argc, char *argv[]) {
                eflags |= ISC_ENTROPY_GOODONLY;
        result = dst_lib_init(mctx, ectx, eflags);
        if (result != ISC_R_SUCCESS)
-               fatal("could not initialize dst");
+               fatal("could not initialize dst: %s",
+                     isc_result_totext(result));
 
        isc_stdtime_get(&now);
 
@@ -252,7 +253,8 @@ main(int argc, char *argv[]) {
                result = dst_key_fromnamedfile(argv[i], DST_TYPE_PUBLIC,
                                               mctx, &key);
                if (result != ISC_R_SUCCESS)
-                       fatal("error loading key from %s", argv[i]);
+                       fatal("error loading key from %s: %s", argv[i],
+                             isc_result_totext(result));
                if (rdatalist.rdclass == 0)
                        rdatalist.rdclass = dst_key_class(key);
 

diff --git a/bin/dnssec/dnssec-signkey.c b/bin/dnssec/dnssec-signkey.c
index ddf699e84f41ab9ab50376ab766749d87f82382c..c97d5ff102bc52e6f41a95d67064ee32044466c9 100644 (file)
--- a/bin/dnssec/dnssec-signkey.c
+++ b/bin/dnssec/dnssec-signkey.c
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-signkey.c,v 1.50 2001/05/10 06:04:57 bwelling Exp $ */
+/* $Id: dnssec-signkey.c,v 1.50.2.1 2001/10/05 00:21:46 bwelling Exp $ */
 
 #include <config.h>
 
@@ -247,7 +247,8 @@ main(int argc, char *argv[]) {
                eflags |= ISC_ENTROPY_GOODONLY;
        result = dst_lib_init(mctx, ectx, eflags);
        if (result != ISC_R_SUCCESS)
-               fatal("could not initialize dst");
+               fatal("could not initialize dst: %s", 
+                     isc_result_totext(result));
 
        isc_stdtime_get(&now);
 

diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
index 3a39e61df1a68cf586c1f32fa313f53c7af961e7..4f6b956cd2ed969f004b591331a8a853f4f2c45f 100644 (file)
--- a/bin/dnssec/dnssec-signzone.c
+++ b/bin/dnssec/dnssec-signzone.c
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-signzone.c,v 1.139 2001/07/22 06:09:41 mayer Exp $ */
+/* $Id: dnssec-signzone.c,v 1.139.2.1 2001/10/05 00:21:48 bwelling Exp $ */
 
 #include <config.h>
 
@@ -491,7 +491,8 @@ hasnullkey(dns_rdataset_t *rdataset) {
                result = dns_dnssec_keyfromrdata(dns_rootname,
                                                 &rdata, mctx, &key);
                if (result != ISC_R_SUCCESS)
-                       fatal("could not convert KEY into internal format");
+                       fatal("could not convert KEY into internal format: %s",
+                             isc_result_totext(result));
                if (dst_key_isnullkey(key))
                        found = ISC_TRUE;
                dst_key_free(&key);
@@ -1684,7 +1685,8 @@ main(int argc, char *argv[]) {
                                                       DST_TYPE_PRIVATE,
                                                       mctx, &newkey);
                        if (result != ISC_R_SUCCESS)
-                               fatal("cannot load key %s", argv[i]); 
+                               fatal("cannot load key %s: %s", argv[i],
+                                     isc_result_totext(result)); 
 
                        key = ISC_LIST_HEAD(keylist);
                        while (key != NULL) {