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

- Fix config globbed include chroot treatment, this fixes reload of

Browse source 
globs (patch from Dag-Erling Smørgrav).


git-svn-id: file:///svn/unbound/trunk@3485 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2015-09-22 08:04:19 +00:00
parent 905297bdd3
commit 897ee33df1
3 changed files with 198 additions and 186 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/Changelog
View file

@ -1,3 +1,7 @@
22 September 2015: Wouter
- Fix config globbed include chroot treatment, this fixes reload of
globs (patch from Dag-Erling Smørgrav).
31 August 2015: Wouter 31 August 2015: Wouter
- changed windows setup compression to be more transparent. - changed windows setup compression to be more transparent.

376
util/configlexer.c
View file

File diff suppressed because it is too large Load diff

4
util/configlexer.lex
View file

@ -126,6 +126,10 @@ static void config_start_include_glob(const char* filename)
#endif #endif
; ;
memset(&g, 0, sizeof(g)); memset(&g, 0, sizeof(g));
if(cfg_parser->chroot && strncmp(filename, cfg_parser->chroot,
strlen(cfg_parser->chroot)) == 0) {
filename += strlen(cfg_parser->chroot);
}
r = glob(filename, flags, NULL, &g); r = glob(filename, flags, NULL, &g);
if(r) { if(r) {
/* some error */ /* some error */