Skip to content

Commit 744bac3

Browse files
committed
metaconfig/named: fix validation of logging channels in categories
Fixes #1784
1 parent 124f057 commit 744bac3

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

ncm-metaconfig/src/main/metaconfig/named/pan/schema.pan

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ type named_zone = {
9696
};
9797

9898
type named_channel_name = string with
99-
exists ("/software/components/metaconfig/services/{/etc/named.conf}/contents/logging/" + SELF) ||
99+
exists ("/software/components/metaconfig/services/{/etc/named.conf}/contents/logging/channels/" + SELF) ||
100100
error (SELF + " doesn't refer to a logging channel");
101101

102102
@{

ncm-metaconfig/src/main/metaconfig/named/tests/profiles/config.pan

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ prefix "/software/components/metaconfig/services/{/etc/named.conf}/contents";
77
"logging/channels/default_debug" = dict (
88
"severity", "dynamic",
99
"file", "data/named.run");
10-
"logging/category" = dict();
10+
"logging/category" = dict(
11+
"queries", list("default_debug"),
12+
);
1113
"includes" = append("/etc/named.rfc1912.zones");
1214
"includes" = append("/etc/another.conf");
1315

0 commit comments

Comments
 (0)