From: Daniel Salzman <daniel.salzman@nic.cz>
Date: Thu, 11 Sep 2025 14:53:20 +0000 (+0200)
Subject: conf: fix knotd_conf_check_args_t.id value when calling from file parsing
X-Git-Tag: v3.5.0~12^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae1b7756a5ceadd8c95db4444003c3910917825f;p=thirdparty%2Fknot-dns.git

conf: fix knotd_conf_check_args_t.id value when calling from file parsing
---

diff --git a/src/knot/conf/base.c b/src/knot/conf/base.c
index fd735deec0..3a64b2b82f 100644
--- a/src/knot/conf/base.c
+++ b/src/knot/conf/base.c
@@ -650,8 +650,8 @@ static int finalize_previous_section(
 	};
 	knotd_conf_check_args_t args = {
 		.item = node->item,
-		.id = node->id,
-		.id_len = node->id_len,
+		.id = (node->parent != NULL) ? node->parent->id : node->id,
+		.id_len = (node->parent != NULL) ? node->parent->id_len : node->id_len,
 		.data = node->data,
 		.data_len = node->data_len,
 		.extra = &extra
@@ -686,8 +686,8 @@ static int finalize_item(
 	};
 	knotd_conf_check_args_t args = {
 		.item = (parser->event == YP_EID) ? node->item->var.g.id : node->item,
-		.id = node->id,
-		.id_len = node->id_len,
+		.id = (node->parent != NULL) ? node->parent->id : node->id,
+		.id_len = (node->parent != NULL) ? node->parent->id_len : node->id_len,
 		.data = node->data,
 		.data_len = node->data_len,
 		.extra = &extra