metaconfig/named: fix validation of logging channels in categories

Fixes #1784
quattor · Dec 11, 2024 · e768b75 · e768b75
1 parent 124f057
commit e768b75
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/ncm-metaconfig/src/main/metaconfig/named/pan/schema.pan b/ncm-metaconfig/src/main/metaconfig/named/pan/schema.pan
@@ -95,9 +95,10 @@ type named_zone = {
     true;
 };
 
-type named_channel_name = string with
-    exists ("/software/components/metaconfig/services/{/etc/named.conf}/contents/logging/" + SELF) ||
-    error (SELF + " doesn't refer to a logging channel");
+type named_channel_name = string with exists (
+    format("/software/components/metaconfig/services/{/etc/named.conf}/contents/logging/channels/%s", SELF)) || error (
+    "%s doesn't refer to a logging channel", SELF,
+);
 
 @{
     Named log parameters

diff --git a/ncm-metaconfig/src/main/metaconfig/named/tests/profiles/config.pan b/ncm-metaconfig/src/main/metaconfig/named/tests/profiles/config.pan
@@ -7,7 +7,9 @@ prefix "/software/components/metaconfig/services/{/etc/named.conf}/contents";
 "logging/channels/default_debug" = dict (
     "severity", "dynamic",
     "file", "data/named.run");
-"logging/category" = dict();
+"logging/category" = dict(
+    "queries", list("default_debug"),
+);
 "includes" = append("/etc/named.rfc1912.zones");
 "includes" = append("/etc/another.conf");