upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-24 00:29:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- The unbound.conf includes are sorted ascending, for include

Browse source 
statements with a '*' from glob.
This commit is contained in:
W.C.A. Wijngaards 2019-09-25 16:50:30 +02:00
parent 06a91b0eaa
commit 55bb4c1275
3 changed files with 315 additions and 313 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/Changelog
View file

@ -1,3 +1,7 @@
25 September 2019: Wouter
- The unbound.conf includes are sorted ascending, for include
statements with a '*' from glob.
23 September 2019: Wouter 23 September 2019: Wouter
- Merge #85 for #84 from sam-lunt: Add kill capability to systemd - Merge #85 for #84 from sam-lunt: Add kill capability to systemd
service file to fix that systemctl reload fails. service file to fix that systemctl reload fails.

619
util/configlexer.c
View file

File diff suppressed because it is too large Load diff

5
util/configlexer.lex
View file

@ -112,8 +112,7 @@ static void config_start_include_glob(const char* filename)
/* check for wildcards */ /* check for wildcards */
#ifdef HAVE_GLOB #ifdef HAVE_GLOB
glob_t g; glob_t g;
size_t i; int i, r, flags;
int r, flags;
if(!(!strchr(filename, '*') && !strchr(filename, '?') && !strchr(filename, '[') && if(!(!strchr(filename, '*') && !strchr(filename, '?') && !strchr(filename, '[') &&
!strchr(filename, '{') && !strchr(filename, '~'))) { !strchr(filename, '{') && !strchr(filename, '~'))) {
flags = 0 flags = 0
@ -144,7 +143,7 @@ static void config_start_include_glob(const char* filename)
return; return;
} }
/* process files found, if any */ /* process files found, if any */
for(i=0; i<(size_t)g.gl_pathc; i++) { for(i=(int)g.gl_pathc-1; i>=0; i--) {
config_start_include(g.gl_pathv[i]); config_start_include(g.gl_pathv[i]);
} }
globfree(&g); globfree(&g);