Replace DNSSEC_ENOENT with KNOT_ENOENT

diff --git a/src/knot/dnssec/zone-keys.c b/src/knot/dnssec/zone-keys.c
index 234a8ac9c2d91c801be5b79f15afef9cc548f07a..a043af716216c8be2bf10655dab80d2f97701678 100644 (file)
--- a/src/knot/dnssec/zone-keys.c
+++ b/src/knot/dnssec/zone-keys.c
@@ -259,8 +259,8 @@ int kdnssec_delete_key(kdnssec_ctx_t *ctx, knot_kasp_key_t *key_ptr)
        }
 
        if (!key_still_used_in_keystore && !key_ptr->is_pub_only) {
-               ret = DNSSEC_ENOENT;
-               for (size_t i = 0; i < ctx->keystores[0].count && ret == DNSSEC_ENOENT; i++) {
+               ret = KNOT_ENOENT;
+               for (size_t i = 0; i < ctx->keystores[0].count && ret == KNOT_ENOENT; i++) {
                        ret = dnssec_keystore_remove(ctx->keystores[i].keystore, key_ptr->id);
                }
                if (ret != KNOT_EOK) {
@@ -481,8 +481,8 @@ static int walk_algorithms(kdnssec_ctx_t *ctx, zone_keyset_t *keyset)
 int kdnssec_load_private(knot_kasp_keystore_t *keystores, const char *id,
                          dnssec_key_t *key, const char **name, unsigned *backend)
 {
-       int ret = DNSSEC_ENOENT;
-       for (size_t i = 0; i < keystores[0].count && (ret == DNSSEC_ENOENT || ret == DNSSEC_NOT_FOUND); i++) {
+       int ret = KNOT_ENOENT;
+       for (size_t i = 0; i < keystores[0].count && (ret == KNOT_ENOENT || ret == DNSSEC_NOT_FOUND); i++) {
                ret = dnssec_keystore_get_private(keystores[i].keystore, id, key);
                if (ret == KNOT_EOK) {
                        if (name != NULL) {

diff --git a/src/knot/zone/backup.c b/src/knot/zone/backup.c
index b27e850067829feccdfb9efcae7428e10d8ac8e6..8d1ddaf8f3f3c187a2dc99461431f100bf39254f 100644 (file)
--- a/src/knot/zone/backup.c
+++ b/src/knot/zone/backup.c
@@ -239,7 +239,7 @@ static int backup_key(key_params_t *parm, const knot_dname_t *zname, bool restor
                                        restore ? "restore" : "backup", parm->id);
                        ret = KNOT_EOK;
                }
-       } else if (ret == DNSSEC_ENOENT) {
+       } else if (ret == KNOT_ENOENT) {
                log_zone_notice(zname, "private key id %s not available, ignoring", parm->id);
                ret = KNOT_EOK;
        }

diff --git a/src/libknot/dnssec/error.c b/src/libknot/dnssec/error.c
index 5e74845ea02eb64576348d219ea456541dcb5058..b26899482b119fd6ae2b0787537565934334a5b7 100644 (file)
--- a/src/libknot/dnssec/error.c
+++ b/src/libknot/dnssec/error.c
@@ -18,7 +18,7 @@ static const error_message_t ERROR_MESSAGES[] = {
 
        { KNOT_ENOMEM,          "not enough memory" },
        { KNOT_EINVAL,          "invalid argument" },
-       { DNSSEC_ENOENT,                "no such file or directory" },
+       { KNOT_ENOENT,          "no such file or directory" },
 
        { DNSSEC_ERROR,                 "unspecified error" },
        { DNSSEC_NOT_IMPLEMENTED_ERROR, "not implemented" },

diff --git a/src/libknot/dnssec/error.h b/src/libknot/dnssec/error.h
index 88f47848bf323388ee4f83e1b2df2dbb687c1377..e6c15fac02344c482d809955d43343430b7cb480 100644 (file)
--- a/src/libknot/dnssec/error.h
+++ b/src/libknot/dnssec/error.h
@@ -28,7 +28,7 @@ enum dnssec_error {
 
        KNOT_ENOMEM = -ENOMEM,
        KNOT_EINVAL = -EINVAL,
-       DNSSEC_ENOENT = -ENOENT,
+       KNOT_ENOENT = -ENOENT,
 
        DNSSEC_ERROR_MIN = -1500,
 

diff --git a/src/libknot/dnssec/keystore/pkcs11.c b/src/libknot/dnssec/keystore/pkcs11.c
index 9a40a11f37acd8be931d6fface11618bb04fa3c2..d42c9d47a08e30f83ff855841c5341e4f4b2c9f5 100644 (file)
--- a/src/libknot/dnssec/keystore/pkcs11.c
+++ b/src/libknot/dnssec/keystore/pkcs11.c
@@ -308,7 +308,7 @@ static int pkcs11_remove_key(void *_ctx, const char *id)
        if (r < 0) {
                return DNSSEC_ERROR;
        } else if (r == 0) {
-               return DNSSEC_ENOENT;
+               return KNOT_ENOENT;
        }
 
        return KNOT_EOK;

diff --git a/tests/libknot/test_dnssec_keystore_pkcs8.c b/tests/libknot/test_dnssec_keystore_pkcs8.c
index 561bd42b123af1d291f1336015cdf37c02cf9dea..0613a2d7585de2b8db4c9f2f4f86542dae620588 100644 (file)
--- a/tests/libknot/test_dnssec_keystore_pkcs8.c
+++ b/tests/libknot/test_dnssec_keystore_pkcs8.c
@@ -66,7 +66,7 @@ int main(void)
        dnssec_key_new(&key);
        dnssec_key_set_algorithm(key, DNSSEC_KEY_ALGORITHM_RSA_SHA256);
        r = dnssec_keystore_get_private(store, id_A, key);
-       ok(r == DNSSEC_ENOENT, "read removed");
+       ok(r == KNOT_ENOENT, "read removed");
        dnssec_key_free(key);
 
        // cleanup