Replace DNSSEC_KEY_ALREADY_PRESENT with KNOT_EEXIST

diff --git a/src/knot/dnssec/zone-keys.c b/src/knot/dnssec/zone-keys.c
index 60126dfbac06dc3bfa70b4f352d87cc065644412..076804190feb6d98e220759247eb63a85c8e9b71 100644 (file)
--- a/src/knot/dnssec/zone-keys.c
+++ b/src/knot/dnssec/zone-keys.c
@@ -522,7 +522,7 @@ static int load_private_keys(kdnssec_ctx_t *ctx, zone_keyset_t *keyset)
                int ret = kdnssec_load_private(ctx->keystores, key->id, key->key, NULL, NULL);
                switch (ret) {
                case KNOT_EOK:
-               case DNSSEC_KEY_ALREADY_PRESENT:
+               case KNOT_EEXIST:
                        break;
                default:
                        ret = knot_error_from_libdnssec(ret);

diff --git a/src/libknot/dnssec/error.c b/src/libknot/dnssec/error.c
index 9c21ddf6f4a7ee6350959dbf97321af6571605e0..4dc8a41c3a58e5f36f600ff29cd4547a692d9170 100644 (file)
--- a/src/libknot/dnssec/error.c
+++ b/src/libknot/dnssec/error.c
@@ -39,7 +39,7 @@ static const error_message_t ERROR_MESSAGES[] = {
 
        { KNOT_NO_PUBLIC_KEY,           "no public key" },
        { KNOT_NO_PRIVATE_KEY,  "no private key" },
-       { DNSSEC_KEY_ALREADY_PRESENT,   "key already present" },
+       { KNOT_EEXIST,  "key already present" },
 
        { DNSSEC_SIGN_INIT_ERROR,       "signing initialization error" },
        { DNSSEC_SIGN_ERROR,            "signing error" },

diff --git a/src/libknot/dnssec/error.h b/src/libknot/dnssec/error.h
index f71d794c4e3729e32a510ee890aafd2c1c0efb1e..374071e7d5f1f2478468b17ba62fb1aad0809006 100644 (file)
--- a/src/libknot/dnssec/error.h
+++ b/src/libknot/dnssec/error.h
@@ -51,7 +51,7 @@ enum dnssec_error {
 
        KNOT_NO_PUBLIC_KEY,
        KNOT_NO_PRIVATE_KEY,
-       DNSSEC_KEY_ALREADY_PRESENT,
+       KNOT_EEXIST,
 
        DNSSEC_SIGN_INIT_ERROR,
        DNSSEC_SIGN_ERROR,

diff --git a/src/libknot/dnssec/key/key.c b/src/libknot/dnssec/key/key.c
index c94fedceb9884f136720633c56a40113bafbfa00..1d22dde4e4e943f64bee2126e71fda49b2f42def 100644 (file)
--- a/src/libknot/dnssec/key/key.c
+++ b/src/libknot/dnssec/key/key.c
@@ -330,7 +330,7 @@ int dnssec_key_set_pubkey(dnssec_key_t *key, const dnssec_binary_t *pubkey)
        }
 
        if (key->public_key) {
-               return DNSSEC_KEY_ALREADY_PRESENT;
+               return KNOT_EEXIST;
        }
 
        if (dnssec_key_get_algorithm(key) == 0) {
@@ -414,7 +414,7 @@ int dnssec_key_set_rdata(dnssec_key_t *key, const dnssec_binary_t *rdata)
        }
 
        if (key->public_key) {
-               return DNSSEC_KEY_ALREADY_PRESENT;
+               return KNOT_EEXIST;
        }
 
        gnutls_pubkey_t new_pubkey = NULL;

diff --git a/src/libknot/dnssec/keystore/keystore.c b/src/libknot/dnssec/keystore/keystore.c
index 55e583f6a47588eebec8d6c6a44f05ef36526d6a..6aa5487575e450bcc3c02ae5dfd58da3e3351b9e 100644 (file)
--- a/src/libknot/dnssec/keystore/keystore.c
+++ b/src/libknot/dnssec/keystore/keystore.c
@@ -142,7 +142,7 @@ int dnssec_keystore_get_private(dnssec_keystore_t *store, const char *id,
        }
 
        if (key->private_key) {
-               return DNSSEC_KEY_ALREADY_PRESENT;
+               return KNOT_EEXIST;
        }
 
        gnutls_privkey_t privkey = NULL;

diff --git a/tests/libknot/test_dnssec_key.c b/tests/libknot/test_dnssec_key.c
index acb77c361f089aef4aaf28a763d548e089197a1d..efbb092b28e1d1e331bfd5b009461e2ca04198d8 100644 (file)
--- a/tests/libknot/test_dnssec_key.c
+++ b/tests/libknot/test_dnssec_key.c
@@ -61,7 +61,7 @@ static void test_public_key(const key_parameters_t *params)
        ok(r == KNOT_EOK, "set public key (succeeds)");
 
        r = dnssec_key_set_pubkey(key, &params->public_key);
-       ok(r == DNSSEC_KEY_ALREADY_PRESENT,
+       ok(r == KNOT_EEXIST,
           "set public key (fails, already present)");
 
        dnssec_binary_t rdata = { 0 };