unbound: fix TLS forwards with optional suffix
Signed-off-by: Eric Luehrsen <ericluehrsen@gmail.com>
This commit is contained in:
parent
8772d56eb5
commit
b101dd76fb
2 changed files with 7 additions and 5 deletions
|
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=unbound
|
PKG_NAME:=unbound
|
||||||
PKG_VERSION:=1.9.6
|
PKG_VERSION:=1.9.6
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=2
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||||
PKG_SOURCE_URL:=https://nlnetlabs.nl/downloads/unbound
|
PKG_SOURCE_URL:=https://nlnetlabs.nl/downloads/unbound
|
||||||
|
|
|
@ -126,7 +126,7 @@ bundle_lan_networks() {
|
||||||
for ifsubnet in $UB_LIST_NETW_ALL ; do
|
for ifsubnet in $UB_LIST_NETW_ALL ; do
|
||||||
case $ifsubnet in
|
case $ifsubnet in
|
||||||
"${ifdashname}"@*)
|
"${ifdashname}"@*)
|
||||||
# Special GLA protection for local block; ULA protected as a catagory
|
# Special GLA protection for local block; ULA protected default
|
||||||
UB_LIST_NETW_LAN="$UB_LIST_NETW_LAN $ifsubnet"
|
UB_LIST_NETW_LAN="$UB_LIST_NETW_LAN $ifsubnet"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
@ -472,7 +472,7 @@ unbound_zone() {
|
||||||
for server in $UB_LIST_ZONE_SERVERS ; do
|
for server in $UB_LIST_ZONE_SERVERS ; do
|
||||||
if [ "$( valid_subnet_any $server )" = "not" ] ; then
|
if [ "$( valid_subnet_any $server )" = "not" ] ; then
|
||||||
case $server in
|
case $server in
|
||||||
*@[0-9]*)
|
*@[0-9]*|*#[A-Za-z0-9]*)
|
||||||
# unique Unbound option for server host name
|
# unique Unbound option for server host name
|
||||||
servers_host="$servers_host $server"
|
servers_host="$servers_host $server"
|
||||||
;;
|
;;
|
||||||
|
@ -483,11 +483,12 @@ unbound_zone() {
|
||||||
else
|
else
|
||||||
servers_host="$servers_host $server${port:+@${port}}"
|
servers_host="$servers_host $server${port:+@${port}}"
|
||||||
fi
|
fi
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
else
|
else
|
||||||
case $server in
|
case $server in
|
||||||
*[0-9]@[0-9]*)
|
*@[0-9]*|*#[A-Za-z0-9]*)
|
||||||
# unique Unbound option for server address
|
# unique Unbound option for server address
|
||||||
servers_ip="$servers_ip $server"
|
servers_ip="$servers_ip $server"
|
||||||
;;
|
;;
|
||||||
|
@ -498,6 +499,7 @@ unbound_zone() {
|
||||||
else
|
else
|
||||||
servers_ip="$servers_ip $server${port:+@${port}}"
|
servers_ip="$servers_ip $server${port:+@${port}}"
|
||||||
fi
|
fi
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
Loading…
Reference in a new issue