Skip to content

Commit 18d9a55

Browse files
committed
- Fix to elevate the diagnostic for no matches for a wildcard
trusted-keys-file, make it more descriptive, and more man page content for it. Thanks to Qifan Zhang, Palo Alto Networks, for the report.
1 parent 2df646e commit 18d9a55

3 files changed

Lines changed: 12 additions & 2 deletions

File tree

doc/Changelog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
8 September 2026: Wouter
2+
- Fix to elevate the diagnostic for no matches for a wildcard
3+
trusted-keys-file, make it more descriptive, and more man
4+
page content for it. Thanks to Qifan Zhang, Palo Alto
5+
Networks, for the report.
6+
17
4 September 2026: Wouter
28
- Fix to make rpz_config leave the rpz with correct set up
39
on failure. The struct is not half configured on exit.

doc/unbound.conf.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2237,6 +2237,9 @@ These options are part of the ``server:`` section.
22372237
It is possible to use wildcards with this statement, the wildcard is
22382238
expanded on start and on reload.
22392239

2240+
A wildcard that matches no files is not an error: the entry loads no
2241+
trust anchors, and the condition is logged at operational verbosity.
2242+
22402243
Default: "" (no trusted keys file)
22412244

22422245

validator/val_anchor.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -829,8 +829,9 @@ anchor_read_bind_file_wild(struct val_anchors* anchors, sldns_buffer* buffer,
829829
if(r) {
830830
/* some error */
831831
if(r == GLOB_NOMATCH) {
832-
verbose(VERB_QUERY, "trusted-keys-file: "
833-
"no matches for %s", pat);
832+
verbose(VERB_OPS, "trusted-keys-file: "
833+
"no matches for %s; "
834+
"no trust anchors loaded from it", pat);
834835
return 1;
835836
} else if(r == GLOB_NOSPACE) {
836837
log_err("wildcard trusted-keys-file %s: "

0 commit comments

Comments
 (0)