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 bug 221.

Browse source 
git-svn-id: file:///svn/unbound/trunk@1384 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2008-12-09 09:28:39 +00:00
parent 098f932df8
commit cb4985f527
2 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/Changelog
View file

@ -1,3 +1,7 @@
9 December 2008: Wouter
- bug #221 fixed: unbound checkconf checks if key files exist if
remote control is enabled. Also fixed NULL printf when not chrooted.
3 December 2008: Wouter 3 December 2008: Wouter
- Fix problem reported by Jaco Engelbrecht where unbound-control stats - Fix problem reported by Jaco Engelbrecht where unbound-control stats
freezes up unbound if this was compiled without threading, and freezes up unbound if this was compiled without threading, and

20
smallapp/unbound-checkconf.c
View file

@ -239,8 +239,12 @@ check_chroot_string(const char* desc, char** ss,
*ss = fname_after_chroot(str, cfg, 1); *ss = fname_after_chroot(str, cfg, 1);
if(!*ss) fatal_exit("out of memory"); if(!*ss) fatal_exit("out of memory");
if(!is_file(*ss)) { if(!is_file(*ss)) {
fatal_exit("%s: \"%s\" does not exist in chrootdir %s", if(chrootdir && chrootdir[0])
desc, str, chrootdir); fatal_exit("%s: \"%s\" does not exist in "
"chrootdir %s", desc, str, chrootdir);
else
fatal_exit("%s: \"%s\" does not exist",
desc, str);
} }
/* put in a new full path for continued checking */ /* put in a new full path for continued checking */
free(str); free(str);
@ -347,6 +351,18 @@ morechecks(struct config_file* cfg, const char* fname)
endpwent(); endpwent();
} }
#endif #endif
if(cfg->remote_control_enable) {
check_chroot_string("server-key-file", &cfg->server_key_file,
cfg->chrootdir, cfg);
check_chroot_string("server-cert-file", &cfg->server_cert_file,
cfg->chrootdir, cfg);
if(!is_file(cfg->control_key_file))
fatal_exit("control-key-file: \"%s\" does not exist",
cfg->control_key_file);
if(!is_file(cfg->control_cert_file))
fatal_exit("control-cert-file: \"%s\" does not exist",
cfg->control_cert_file);
}
localzonechecks(cfg); localzonechecks(cfg);
} }