Merge pull request #8850 from EricLuehrsen/unbound_dhcp_1806

[18.06] unbound: fix local dns synthesis corner cases
This commit is contained in:
Rosen Penev 2019-04-30 11:47:36 -07:00 committed by GitHub
commit 46d30c2215
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions

View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=unbound PKG_NAME:=unbound
PKG_VERSION:=1.9.1 PKG_VERSION:=1.9.1
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_LICENSE:=BSD-3-Clause PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE

View file

@ -85,6 +85,7 @@
while ( ( cmd | getline adr ) > 0 ) { while ( ( cmd | getline adr ) > 0 ) {
if (( substr( adr, 1, 5 ) <= "fdff:" ) \ if (( substr( adr, 1, 5 ) <= "fdff:" ) \
&& ( index( adr, "::/" ) != 0 ) \
&& ( index( adr, "anycast" ) == 0 ) \ && ( index( adr, "anycast" ) == 0 ) \
&& ( index( adr, "via" ) == 0 )) { && ( index( adr, "via" ) == 0 )) {
# GA or ULA routed addresses only (not LL or MC) # GA or ULA routed addresses only (not LL or MC)

View file

@ -113,7 +113,7 @@ create_interface_dns() {
# Create local-data: references for this hosts interfaces (router). # Create local-data: references for this hosts interfaces (router).
config_get logint "$cfg" interface config_get logint "$cfg" interface
config_get_bool ignore "$cfg" ignore 0 config_get_bool ignore "$cfg" ignore 0
network_get_device ifname "$cfg" network_get_device ifname "$logint"
ifdashname="${ifname//./-}" ifdashname="${ifname//./-}"
ipcommand="ip -o address show $ifname" ipcommand="ip -o address show $ifname"