Replace DNSSEC_NOT_FOUND with KNOT_ENOENT

diff --git a/src/knot/dnssec/zone-keys.c b/src/knot/dnssec/zone-keys.c
index a043af716216c8be2bf10655dab80d2f97701678..60126dfbac06dc3bfa70b4f352d87cc065644412 100644 (file)
--- a/src/knot/dnssec/zone-keys.c
+++ b/src/knot/dnssec/zone-keys.c
@@ -482,7 +482,7 @@ int kdnssec_load_private(knot_kasp_keystore_t *keystores, const char *id,
                          dnssec_key_t *key, const char **name, unsigned *backend)
 {
        int ret = KNOT_ENOENT;
-       for (size_t i = 0; i < keystores[0].count && (ret == KNOT_ENOENT || ret == DNSSEC_NOT_FOUND); i++) {
+       for (size_t i = 0; i < keystores[0].count && (ret == KNOT_ENOENT); i++) {
                ret = dnssec_keystore_get_private(keystores[i].keystore, id, key);
                if (ret == KNOT_EOK) {
                        if (name != NULL) {

diff --git a/src/libknot/dnssec/error.c b/src/libknot/dnssec/error.c
index 44ae7018b7334607b65de4b8c17785989bf56e05..7faa37863fd3311c2ada17a8811b1356e15b0c5e 100644 (file)
--- a/src/libknot/dnssec/error.c
+++ b/src/libknot/dnssec/error.c
@@ -23,7 +23,7 @@ static const error_message_t ERROR_MESSAGES[] = {
        { DNSSEC_ERROR,                 "unspecified error" },
        { KNOT_ENOTSUP, "not implemented" },
        { KNOT_EMALF,   "malformed data" },
-       { DNSSEC_NOT_FOUND,             "not found" },
+       { KNOT_ENOENT,          "not found" },
 
        { DNSSEC_PKCS8_IMPORT_ERROR,    "PKCS #8 import error" },
        { DNSSEC_KEY_EXPORT_ERROR,      "key export error" },

diff --git a/src/libknot/dnssec/error.h b/src/libknot/dnssec/error.h
index cb11eae3ea6a9f0333fbbf0a6b5c34d7d55ac55e..996753547c3de4014d499507d9431c141d100f38 100644 (file)
--- a/src/libknot/dnssec/error.h
+++ b/src/libknot/dnssec/error.h
@@ -35,7 +35,7 @@ enum dnssec_error {
        DNSSEC_ERROR = DNSSEC_ERROR_MIN,
        KNOT_ENOTSUP,
        KNOT_EMALF,
-       DNSSEC_NOT_FOUND,
+       KNOT_ENOENT,
 
        DNSSEC_PKCS8_IMPORT_ERROR,
        DNSSEC_KEY_EXPORT_ERROR,

diff --git a/src/libknot/dnssec/keystore/pkcs11.c b/src/libknot/dnssec/keystore/pkcs11.c
index 261f029bcbd2597acac440362cd38be6666ed5f3..4be9068883924c0f4199e11124ed1eaab35f538d 100644 (file)
--- a/src/libknot/dnssec/keystore/pkcs11.c
+++ b/src/libknot/dnssec/keystore/pkcs11.c
@@ -333,7 +333,7 @@ static int pkcs11_get_private(void *_ctx, const char *id, gnutls_privkey_t *key_
        r = gnutls_privkey_import_pkcs11_url(key, url);
        if (r != GNUTLS_E_SUCCESS) {
                gnutls_privkey_deinit(key);
-               return DNSSEC_NOT_FOUND;
+               return KNOT_ENOENT;
        }
 
        *key_ptr = key;

diff --git a/src/libknot/dnssec/keystore/pkcs8.c b/src/libknot/dnssec/keystore/pkcs8.c
index 51aabe7098583a99e5616b1ef5abfde9125741ed..c13eda230b581507f6da346929225a14ad6751ac 100644 (file)
--- a/src/libknot/dnssec/keystore/pkcs8.c
+++ b/src/libknot/dnssec/keystore/pkcs8.c
@@ -249,7 +249,7 @@ static int pkcs8_open(void *ctx, const char *config)
 
        char *path = realpath(config, NULL);
        if (!path) {
-               return DNSSEC_NOT_FOUND;
+               return KNOT_ENOENT;
        }
 
        handle->dir_name = path;

diff --git a/src/libknot/error.c b/src/libknot/error.c
index 9193ec87959f5fc5d8283f66344dc144fffd7311..720b85f65836b6a9f2680935383d8de625b13fad 100644 (file)
--- a/src/libknot/error.c
+++ b/src/libknot/error.c
@@ -201,7 +201,7 @@ int knot_error_from_libdnssec(int libdnssec_errcode)
                return KNOT_ERROR;
        case KNOT_EMALF:
                return KNOT_EMALF;
-       case DNSSEC_NOT_FOUND:
+       case KNOT_ENOENT:
                return KNOT_ENOENT;
        case DNSSEC_NO_PUBLIC_KEY:
        case DNSSEC_NO_PRIVATE_KEY:

diff --git a/src/utils/keymgr/bind_privkey.c b/src/utils/keymgr/bind_privkey.c
index d9ba531ee121d54e6cecf6eac54b8810b5089af2..c58b8f77b43c99b2fab9c2abc167babd2a906a92 100644 (file)
--- a/src/utils/keymgr/bind_privkey.c
+++ b/src/utils/keymgr/bind_privkey.c
@@ -198,7 +198,7 @@ int bind_privkey_parse(const char *filename, bind_privkey_t *params_ptr)
 {
        _cleanup_fclose_ FILE *file = fopen(filename, "r");
        if (!file) {
-               return DNSSEC_NOT_FOUND;
+               return KNOT_ENOENT;
        }
 
        bind_privkey_t params = *params_ptr;