From: Daniel Salzman <daniel.salzman@nic.cz>
Date: Tue, 21 Oct 2025 08:26:51 +0000 (+0200)
Subject: Replace DNSSEC_KEY_ALREADY_PRESENT with KNOT_EEXIST
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd0597205370a4fe3a0bb596ac2a2788ce851c1c;p=thirdparty%2Fknot-dns.git

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 60126dfbac..076804190f 100644
--- 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 9c21ddf6f4..4dc8a41c3a 100644
--- 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 f71d794c4e..374071e7d5 100644
--- 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 c94fedceb9..1d22dde4e4 100644
--- 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 55e583f6a4..6aa5487575 100644
--- 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 acb77c361f..efbb092b28 100644
--- 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 };