]> git.ipfire.org Git - thirdparty/knot-dns.git/commitdiff
conf: fix knotd_conf_check_args_t.id value when calling from file parsing
authorDaniel Salzman <daniel.salzman@nic.cz>
Thu, 11 Sep 2025 14:53:20 +0000 (16:53 +0200)
committerDaniel Salzman <daniel.salzman@nic.cz>
Fri, 12 Sep 2025 07:37:57 +0000 (09:37 +0200)
src/knot/conf/base.c

index fd735deec0685617724cf4460851a1f14523a405..3a64b2b82fb6373f98a9b563e80f52cba22ea22e 100644 (file)
@@ -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