Browse Source

Merge pull request #10986 from EricLuehrsen/unbound_tls_fix

unbound: fix TLS forwards with optional suffix
lilik-openwrt-22.03
Hannu Nyman 5 years ago
committed by GitHub
parent
commit
14e4c063c6
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
  1. +1
    -1
      net/unbound/Makefile
  2. +6
    -4
      net/unbound/files/unbound.sh

+ 1
- 1
net/unbound/Makefile View File

@ -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


+ 6
- 4
net/unbound/files/unbound.sh View File

@ -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
@ -1176,7 +1178,7 @@ unbound_hostname() {
namerec=" local-data: \"$name. 300 IN AAAA $ifaddr\"" namerec=" local-data: \"$name. 300 IN AAAA $ifaddr\""
echo "$namerec" >> $UB_HOST_CONF echo "$namerec" >> $UB_HOST_CONF
fi fi
;;
;;
esac esac
done done
echo >> $UB_HOST_CONF echo >> $UB_HOST_CONF


Loading…
Cancel
Save