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 #4130: print text describing -dd and unbound-checkconf on

Browse source 
config file read error at startup, the errors may have been moved
  away by the startup process.


git-svn-id: file:///svn/unbound/trunk@4792 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2018-07-20 05:42:38 +00:00
parent 38e77d50f2
commit bded93f69b
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
daemon/unbound.c
View file

@ -627,8 +627,10 @@ run_daemon(const char* cfgfile, int cmdline_verbose, int debug_mode, const char*
fatal_exit("Could not alloc config defaults"); fatal_exit("Could not alloc config defaults");
if(!config_read(cfg, cfgfile, daemon->chroot)) { if(!config_read(cfg, cfgfile, daemon->chroot)) {
if(errno != ENOENT) if(errno != ENOENT)
fatal_exit("Could not read config file: %s", fatal_exit("Could not read config file: %s."
cfgfile); " With unbound -dd it stays on the "
" commandline to see more errors, "
" or unbound-checkconf", cfgfile);
log_warn("Continuing with default config settings"); log_warn("Continuing with default config settings");
} }
apply_settings(daemon, cfg, cmdline_verbose, debug_mode, log_default_identity); apply_settings(daemon, cfg, cmdline_verbose, debug_mode, log_default_identity);

5
doc/Changelog
View file

@ -1,3 +1,8 @@
20 July 2018: Wouter
- Fix #4130: print text describing -dd and unbound-checkconf on
config file read error at startup, the errors may have been moved
away by the startup process.
19 July 2018: Wouter 19 July 2018: Wouter
- Fix #4129 unbound-control error message with wrong cert permissions - Fix #4129 unbound-control error message with wrong cert permissions
is too cryptic. is too cryptic.