- ignore trusted-keys globs that have no files (from Paul Wouters).

git-svn-id: file:///svn/unbound/trunk@2770 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index c9be58a7213fdcd639185518dd8f2b5fe9404a32..ac60fc4561cd3b5b54fd9484f644ca1a037dc47a 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+1 October 2012: Wouter
+       - ignore trusted-keys globs that have no files (from Paul Wouters).
+
 27 September 2012: Wouter
        - include: directive in config file accepts wildcards.  Patch from
          Paul Wouters.  Suggested use: include: "/etc/unbound.d/conf.d/*"

diff --git a/validator/val_anchor.c b/validator/val_anchor.c
index fa69df52d6807bf5e90cf3e7d435af43c197bddb..cc551f83320f48bddaa8feb8f696961375add533 100644 (file)
--- a/validator/val_anchor.c
+++ b/validator/val_anchor.c
@@ -836,7 +836,8 @@ anchor_read_bind_file_wild(struct val_anchors* anchors, ldns_buffer* buffer,
                        log_err("wildcard trusted-keys-file %s: expansion "
                                "failed (%s)", pat, strerror(errno));
                }
-               return 0;
+               /* ignore globs that yield no files */
+               return 1; 
        }
        /* process files found, if any */
        for(i=0; i<(size_t)g.gl_pathc; i++) {