From 1115d50dcefa5b12a66bca469b9dcfae2d0af9ba Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Fri, 28 Sep 2007 14:33:35 +0000 Subject: [PATCH] unbound-checkconf test. git-svn-id: file:///svn/unbound/trunk@649 be551aaa-1e26-0410-a405-d3ace91eadb9 --- checkconf/unbound-checkconf.c | 11 +++++++++++ doc/Changelog | 4 ++++ iterator/iter_donotq.c | 2 +- testdata/04-checkconf.tpkg | Bin 0 -> 4580 bytes util/configlexer.lex | 2 +- 5 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 testdata/04-checkconf.tpkg diff --git a/checkconf/unbound-checkconf.c b/checkconf/unbound-checkconf.c index 02480ca7f..ded21e4b0 100644 --- a/checkconf/unbound-checkconf.c +++ b/checkconf/unbound-checkconf.c @@ -46,6 +46,7 @@ #include "util/log.h" #include "util/config_file.h" #include "util/module.h" +#include "util/net_help.h" #include "util/region-allocator.h" #include "iterator/iterator.h" #include "validator/validator.h" @@ -85,6 +86,16 @@ check_mod(struct config_file* cfg, struct module_func_block* fb) static void morechecks(struct config_file* cfg) { + int i; + for(i=0; inum_ifs; i++) { + struct sockaddr_storage a; + socklen_t alen; + if(!ipstrtoaddr(cfg->ifs[i], UNBOUND_DNS_PORT, &a, &alen)) { + fatal_exit("cannot parse interface specified as '%s'", + cfg->ifs[i]); + } + } + if(cfg->verbosity < 0) fatal_exit("verbosity value < 0"); if(cfg->num_threads < 0 || cfg->num_threads > 10000) diff --git a/doc/Changelog b/doc/Changelog index 06185afd0..7f5b2dd09 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,7 @@ +28 September 2007: Wouter + - test case for unbound-checkconf, fixed so it also checks the + interface: statements. + 26 September 2007: Wouter - SIGHUP will reopen the log file. - Option to log to syslog. diff --git a/iterator/iter_donotq.c b/iterator/iter_donotq.c index bfd39ef48..185e2b403 100644 --- a/iterator/iter_donotq.c +++ b/iterator/iter_donotq.c @@ -95,7 +95,7 @@ donotq_insert(struct iter_donotq* dq, struct sockaddr_storage* addr, memcpy(&node->addr, addr, addrlen); node->addrlen = addrlen; if(!rbtree_insert(dq->tree, &node->node)) { - log_warn("duplicate donotquery address ignored."); + verbose(VERB_DETAIL, "duplicate donotquery address ignored."); } return 1; } diff --git a/testdata/04-checkconf.tpkg b/testdata/04-checkconf.tpkg new file mode 100644 index 0000000000000000000000000000000000000000..66d5589a5748a63515f0dd9878ef0bfda17bed11 GIT binary patch literal 4580 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