From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Mon, 1 Oct 2012 07:18:49 +0000 (+0000)
Subject: - ignore trusted-keys globs that have no files (from Paul Wouters).
X-Git-Tag: release-1.4.19rc1~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a8e468fc676b9f208f8600337edede388a779979;p=thirdparty%2Funbound.git

- 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 c9be58a72..ac60fc456 100644
--- 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 fa69df52d..cc551f833 100644
--- 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++) {