From ad620622a56cfc9bbf7dca90762cffb28427760a Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Mon, 22 Mar 2010 09:38:06 +0000 Subject: [PATCH] Fix bug#301. git-svn-id: file:///svn/unbound/trunk@2057 be551aaa-1e26-0410-a405-d3ace91eadb9 --- doc/Changelog | 2 ++ smallapp/unbound-checkconf.c | 2 +- testdata/04-checkconf.tpkg | Bin 5021 -> 5127 bytes 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/Changelog b/doc/Changelog index 2ffbc693e..496d60dbf 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,6 +1,8 @@ 22 March 2010: Wouter - unbound-host disables use-syslog from config file so that the config file for the main server can be used more easily. + - fix bug#301: unbound-checkconf could not parse interface + '0.0.0.0@5353', even though unbound itself worked fine. 19 March 2010: Wouter - fix fwd_ancil test to pass if the socket options are not supported. diff --git a/smallapp/unbound-checkconf.c b/smallapp/unbound-checkconf.c index 40ca6b72b..bed13c7da 100644 --- a/smallapp/unbound-checkconf.c +++ b/smallapp/unbound-checkconf.c @@ -157,7 +157,7 @@ interfacechecks(struct config_file* cfg) socklen_t alen; int i, j; for(i=0; inum_ifs; i++) { - if(!ipstrtoaddr(cfg->ifs[i], UNBOUND_DNS_PORT, &a, &alen)) { + if(!extstrtoaddr(cfg->ifs[i], &a, &alen)) { fatal_exit("cannot parse interface specified as '%s'", cfg->ifs[i]); } diff --git a/testdata/04-checkconf.tpkg b/testdata/04-checkconf.tpkg index 4b236ce9c6429828ee97b2deedd8624f6f3c97e5..f2ffe3535ff78f945ae5a39150321bfdaf320363 100644 GIT binary patch literal 5127 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 literal 5021 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