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

- Fix to not set GLOB_NOSORT so the unbound.conf include: files are

Browse source 
sorted and in a predictable order.


git-svn-id: file:///svn/unbound/trunk@4975 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2018-11-26 09:54:34 +00:00
parent 816aa50dfc
commit 4d5b32ee59
3 changed files with 305 additions and 303 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/Changelog
View file

@ -1,3 +1,7 @@
26 November 2018: Wouter
- Fix to not set GLOB_NOSORT so the unbound.conf include: files are
sorted and in a predictable order.
22 November 2018: Wouter 22 November 2018: Wouter
- With ./configure --with-pyunbound --with-pythonmodule - With ./configure --with-pyunbound --with-pythonmodule
PYTHON_VERSION=3.6 or with 2.7 unbound can compile and unit tests PYTHON_VERSION=3.6 or with 2.7 unbound can compile and unit tests

599
util/configlexer.c
View file

File diff suppressed because it is too large Load diff

5
util/configlexer.lex
View file

@ -120,9 +120,8 @@ static void config_start_include_glob(const char* filename)
#ifdef GLOB_ERR #ifdef GLOB_ERR
| GLOB_ERR | GLOB_ERR
#endif #endif
#ifdef GLOB_NOSORT /* do not set GLOB_NOSORT so the results are sorted
| GLOB_NOSORT and in a predictable order. */
#endif
#ifdef GLOB_BRACE #ifdef GLOB_BRACE
| GLOB_BRACE | GLOB_BRACE
#endif #endif