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

fixup localzone nodefault issue, the trailing dot was used in comparisons.

Browse source 
git-svn-id: file:///svn/unbound/trunk@1106 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2008-06-03 12:32:08 +00:00
parent 66c8bd4ad1
commit d7f2306161
3 changed files with 34 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/Changelog
View file

@ -1,3 +1,7 @@
3 June 2008: Wouter
- fixup local-zone: "30.172.in-addr.arpa." nodefault, so that the
trailing dot is not used during comparison.
2 June 2008: Wouter 2 June 2008: Wouter
- Jelte fixed bugs in my absence - Jelte fixed bugs in my absence
- bug 178: fixed unportable shell usage in configure (relied on - bug 178: fixed unportable shell usage in configure (relied on

54
services/localzone.c
View file

@ -528,9 +528,15 @@ static int
lz_nodefault(struct config_file* cfg, const char* name) lz_nodefault(struct config_file* cfg, const char* name)
{ {
struct config_strlist* p; struct config_strlist* p;
size_t len = strlen(name);
if(len == 0) return 0;
if(name[len-1] == '.') len--;
for(p = cfg->local_zones_nodefault; p; p = p->next) { for(p = cfg->local_zones_nodefault; p; p = p->next) {
/* compare zone name, lowercase */ /* compare zone name, lowercase, compare without ending . */
if(strcasecmp(p->str, name) == 0) if(strncasecmp(p->str, name, len) == 0 &&
(strlen(p->str) == len || (strlen(p->str)==len+1 &&
p->str[len] == '.')))
return 1; return 1;
} }
return 0; return 0;
@ -614,28 +620,28 @@ lz_enter_defaults(struct local_zones* zones, struct config_file* cfg,
return 0; return 0;
} }
} }
if ( !add_as112_default(zones, cfg, buf, "10.in-addr.arpa") || if ( !add_as112_default(zones, cfg, buf, "10.in-addr.arpa.") ||
!add_as112_default(zones, cfg, buf, "16.172.in-addr.arpa") || !add_as112_default(zones, cfg, buf, "16.172.in-addr.arpa.") ||
!add_as112_default(zones, cfg, buf, "17.172.in-addr.arpa") || !add_as112_default(zones, cfg, buf, "17.172.in-addr.arpa.") ||
!add_as112_default(zones, cfg, buf, "18.172.in-addr.arpa") || !add_as112_default(zones, cfg, buf, "18.172.in-addr.arpa.") ||
!add_as112_default(zones, cfg, buf, "19.172.in-addr.arpa") || !add_as112_default(zones, cfg, buf, "19.172.in-addr.arpa.") ||
!add_as112_default(zones, cfg, buf, "20.172.in-addr.arpa") || !add_as112_default(zones, cfg, buf, "20.172.in-addr.arpa.") ||
!add_as112_default(zones, cfg, buf, "21.172.in-addr.arpa") || !add_as112_default(zones, cfg, buf, "21.172.in-addr.arpa.") ||
!add_as112_default(zones, cfg, buf, "22.172.in-addr.arpa") || !add_as112_default(zones, cfg, buf, "22.172.in-addr.arpa.") ||
!add_as112_default(zones, cfg, buf, "23.172.in-addr.arpa") || !add_as112_default(zones, cfg, buf, "23.172.in-addr.arpa.") ||
!add_as112_default(zones, cfg, buf, "24.172.in-addr.arpa") || !add_as112_default(zones, cfg, buf, "24.172.in-addr.arpa.") ||
!add_as112_default(zones, cfg, buf, "25.172.in-addr.arpa") || !add_as112_default(zones, cfg, buf, "25.172.in-addr.arpa.") ||
!add_as112_default(zones, cfg, buf, "26.172.in-addr.arpa") || !add_as112_default(zones, cfg, buf, "26.172.in-addr.arpa.") ||
!add_as112_default(zones, cfg, buf, "27.172.in-addr.arpa") || !add_as112_default(zones, cfg, buf, "27.172.in-addr.arpa.") ||
!add_as112_default(zones, cfg, buf, "28.172.in-addr.arpa") || !add_as112_default(zones, cfg, buf, "28.172.in-addr.arpa.") ||
!add_as112_default(zones, cfg, buf, "29.172.in-addr.arpa") || !add_as112_default(zones, cfg, buf, "29.172.in-addr.arpa.") ||
!add_as112_default(zones, cfg, buf, "30.172.in-addr.arpa") || !add_as112_default(zones, cfg, buf, "30.172.in-addr.arpa.") ||
!add_as112_default(zones, cfg, buf, "31.172.in-addr.arpa") || !add_as112_default(zones, cfg, buf, "31.172.in-addr.arpa.") ||
!add_as112_default(zones, cfg, buf, "168.192.in-addr.arpa") || !add_as112_default(zones, cfg, buf, "168.192.in-addr.arpa.") ||
!add_as112_default(zones, cfg, buf, "0.in-addr.arpa") || !add_as112_default(zones, cfg, buf, "0.in-addr.arpa.") ||
!add_as112_default(zones, cfg, buf, "254.169.in-addr.arpa") || !add_as112_default(zones, cfg, buf, "254.169.in-addr.arpa.") ||
!add_as112_default(zones, cfg, buf, "2.0.192.in-addr.arpa") || !add_as112_default(zones, cfg, buf, "2.0.192.in-addr.arpa.") ||
!add_as112_default(zones, cfg, buf, "255.255.255.255.in-addr.arpa") || !add_as112_default(zones, cfg, buf, "255.255.255.255.in-addr.arpa.") ||
!add_as112_default(zones, cfg, buf, "0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa.") || !add_as112_default(zones, cfg, buf, "0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa.") ||
!add_as112_default(zones, cfg, buf, "d.f.ip6.arpa.") || !add_as112_default(zones, cfg, buf, "d.f.ip6.arpa.") ||
!add_as112_default(zones, cfg, buf, "8.e.f.ip6.arpa.") || !add_as112_default(zones, cfg, buf, "8.e.f.ip6.arpa.") ||

BIN
testdata/local_nodefault.tpkg vendored Normal file
View file

Binary file not shown.