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 directory: fix for unbound-checkconf, it restores cwd.

Browse source 
git-svn-id: file:///svn/unbound/trunk@3783 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2016-06-13 13:33:51 +00:00
parent 5b63c08c72
commit 2fffe65332
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/Changelog
View file

@ -6,6 +6,7 @@
13 June 2016: Wouter 13 June 2016: Wouter
- Fix #778: unbound 1.5.9: -h segfault (null deref). - Fix #778: unbound 1.5.9: -h segfault (null deref).
- Fix directory: fix for unbound-checkconf, it restores cwd.
10 June 2016: Wouter 10 June 2016: Wouter
- And delete service.conf.shipped on uninstall. - And delete service.conf.shipped on uninstall.

8
smallapp/unbound-checkconf.c
View file

@ -481,14 +481,22 @@ check_hints(struct config_file* cfg)
static void static void
checkconf(const char* cfgfile, const char* opt, int final) checkconf(const char* cfgfile, const char* opt, int final)
{ {
char oldwd[PATH_MAX];
struct config_file* cfg = config_create(); struct config_file* cfg = config_create();
if(!cfg) if(!cfg)
fatal_exit("out of memory"); fatal_exit("out of memory");
oldwd[0] = 0;
if(!getcwd(oldwd, sizeof(oldwd))) {
log_err("cannot getcwd: %s", strerror(errno));
oldwd[0] = 0;
}
if(!config_read(cfg, cfgfile, NULL)) { if(!config_read(cfg, cfgfile, NULL)) {
/* config_read prints messages to stderr */ /* config_read prints messages to stderr */
config_delete(cfg); config_delete(cfg);
exit(1); exit(1);
} }
if(oldwd[0] && chdir(oldwd) == -1)
log_err("cannot chdir(%s): %s", oldwd, strerror(errno));
if(opt) { if(opt) {
print_option(cfg, opt, final); print_option(cfg, opt, final);
config_delete(cfg); config_delete(cfg);