diff options
| author | Riccardo Spagni <ric@spagni.net> | 2015-12-30 13:21:50 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2015-12-30 13:21:50 +0200 |
| commit | 91001aa4460a59a42dc14a32c8e90717fd29dbd2 (patch) | |
| tree | 68da43b847d517870a2f5c92a6ef13167730945c /external/unbound/util/configlexer.lex | |
| parent | Merge pull request #577 (diff) | |
| parent | fix missing unbound tests (diff) | |
| download | monero-91001aa4460a59a42dc14a32c8e90717fd29dbd2.tar.xz | |
Merge pull request #578
3edbf57 fix missing unbound tests (Riccardo Spagni)
2d43ae8 update unbound, fix unbound openssl issue on OS X (Riccardo Spagni)
Diffstat (limited to '')
| -rw-r--r-- | external/unbound/util/configlexer.lex | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/external/unbound/util/configlexer.lex b/external/unbound/util/configlexer.lex index a776c766f..6637943e4 100644 --- a/external/unbound/util/configlexer.lex +++ b/external/unbound/util/configlexer.lex @@ -126,6 +126,10 @@ static void config_start_include_glob(const char* filename) #endif ; 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); if(r) { /* some error */ @@ -201,6 +205,7 @@ SQANY [^\'\n\r\\]|\\. /* note that flex makes the longest match and '.' is any but not nl */ LEXOUT(("comment(%s) ", yytext)); /* ignore */ } server{COLON} { YDVAR(0, VAR_SERVER) } +qname-minimisation{COLON} { YDVAR(1, VAR_QNAME_MINIMISATION) } num-threads{COLON} { YDVAR(1, VAR_NUM_THREADS) } verbosity{COLON} { YDVAR(1, VAR_VERBOSITY) } port{COLON} { YDVAR(1, VAR_PORT) } |