clean up uses of DST_R_NOCRYPTO

building BIND without crypto support is no longer possible.
consequently this result code is never sent, and therefore we
don't need code in calling functions to handle it.

diff --git a/bin/delv/delv.c b/bin/delv/delv.c
index f6ac3d25428f4e75ec676038c6be82e41dd77a84..64bbfa7d4235c5e159599533361a12beb2d5e320 100644 (file)
--- a/bin/delv/delv.c
+++ b/bin/delv/delv.c
@@ -787,9 +787,7 @@ key_fromconfig(const cfg_obj_t *key, dns_client_t *client, dns_view_t *toview) {
        num_keys++;
 
 cleanup:
-       if (result == DST_R_NOCRYPTO) {
-               cfg_obj_log(key, ISC_LOG_ERROR, "no crypto support");
-       } else if (result == DST_R_UNSUPPORTEDALG) {
+       if (result == DST_R_UNSUPPORTEDALG) {
                cfg_obj_log(key, ISC_LOG_WARNING,
                            "skipping trusted key '%s': %s", keynamestr,
                            isc_result_totext(result));
@@ -823,9 +821,6 @@ load_keys(const cfg_obj_t *keys, dns_client_t *client, dns_view_t *toview) {
        }
 
 cleanup:
-       if (result == DST_R_NOCRYPTO) {
-               result = ISC_R_SUCCESS;
-       }
        return result;
 }
 

diff --git a/bin/named/server.c b/bin/named/server.c
index 346a13d27614d63940b5b876e0496ead42a8573f..9eab82568bf64b2773e6689765a6da82edbead86 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -904,15 +904,6 @@ process_key(const cfg_obj_t *key, dns_keytable_t *secroots,
                            initializing ? "initial-key" : "static-key",
                            namestr, isc_result_totext(result));
                return ISC_R_SUCCESS;
-       case DST_R_NOCRYPTO:
-               /*
-                * Crypto support is not available.
-                */
-               cfg_obj_log(key, ISC_LOG_ERROR,
-                           "ignoring %s for '%s': no crypto support",
-                           initializing ? "initial-key" : "static-key",
-                           namestr);
-               return result;
        default:
                /*
                 * Something unexpected happened; we have no choice but to
@@ -994,9 +985,6 @@ cleanup:
        if (secroots != NULL) {
                dns_keytable_detach(&secroots);
        }
-       if (result == DST_R_NOCRYPTO) {
-               result = ISC_R_SUCCESS;
-       }
        return result;
 }