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 #603: unbound-checkconf -o <option> should skip verification

Browse source 
checks.


git-svn-id: file:///svn/unbound/trunk@3207 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2014-08-18 07:21:01 +00:00
parent 8ccba42b1f
commit 0c7d24f655
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/Changelog
View file

@ -1,9 +1,17 @@
18 August 2014: Wouter
- Fix #603: unbound-checkconf -o <option> should skip verification
checks.
5 August 2014: Wouter 5 August 2014: Wouter
- dnstap support, with a patch from Farsight Security, written by - dnstap support, with a patch from Farsight Security, written by
Robert Edmonds. The --enable-dnstap needs libfstrm and protobuf-c. Robert Edmonds. The --enable-dnstap needs libfstrm and protobuf-c.
It is BSD licensed (see dnstap/dnstap.c). It is BSD licensed (see dnstap/dnstap.c).
Building with --enable-dnstap needs pkg-config with this patch. Building with --enable-dnstap needs pkg-config with this patch.
- Noted dnstap in doc/README and doc/CREDITS. - Noted dnstap in doc/README and doc/CREDITS.
- Changes to the dnstap patch.
- lint fixes.
- dnstap/dnstap_config.h should not have been added to the repo,
because is it generated.
1 August 2014: Wouter 1 August 2014: Wouter
- Patch add msg, rrset, infra and key cache sizes to stats command - Patch add msg, rrset, infra and key cache sizes to stats command

8
smallapp/unbound-checkconf.c
View file

@ -459,6 +459,11 @@ checkconf(const char* cfgfile, const char* opt)
config_delete(cfg); config_delete(cfg);
exit(1); exit(1);
} }
if(opt) {
print_option(cfg, opt);
config_delete(cfg);
return;
}
morechecks(cfg, cfgfile); morechecks(cfg, cfgfile);
check_mod(cfg, iter_get_funcblock()); check_mod(cfg, iter_get_funcblock());
check_mod(cfg, val_get_funcblock()); check_mod(cfg, val_get_funcblock());
@ -468,8 +473,7 @@ checkconf(const char* cfgfile, const char* opt)
#endif #endif
check_fwd(cfg); check_fwd(cfg);
check_hints(cfg); check_hints(cfg);
if(opt) print_option(cfg, opt); printf("unbound-checkconf: no errors in %s\n", cfgfile);
else printf("unbound-checkconf: no errors in %s\n", cfgfile);
config_delete(cfg); config_delete(cfg);
} }