From: Daniel Salzman <daniel.salzman@nic.cz>
Date: Tue, 21 Oct 2025 07:54:03 +0000 (+0200)
Subject: Replace DNSSEC_ENOENT with KNOT_ENOENT
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=768b3c0fdb47796fe8819faf1f028995ca5745ae;p=thirdparty%2Fknot-dns.git

Replace DNSSEC_ENOENT with KNOT_ENOENT
---

diff --git a/src/knot/dnssec/zone-keys.c b/src/knot/dnssec/zone-keys.c
index 234a8ac9c2..a043af7162 100644
--- 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 b27e850067..8d1ddaf8f3 100644
--- 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 5e74845ea0..b26899482b 100644
--- 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 88f47848bf..e6c15fac02 100644
--- 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 9a40a11f37..d42c9d47a0 100644
--- 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 561bd42b12..0613a2d758 100644
--- 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