unbound: allow additional search domains

Add a config option add_search to allow the addition of
additional domains to the /etc/resolv.conf search option.

Author: brianjmurrell

net/unbound/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=unbound
 PKG_VERSION:=1.24.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://nlnetlabs.nl/downloads/unbound

net/unbound/files/README.md

@@ -203,6 +203,7 @@ One instance is supported currently.
 | --- | ------- | ----- | ----------- | ------- |
 | add_extra_dns | 0 | level | Read OpenWrt traditional options for `dnsmasq`.<br>`0`: Disabled<br>`1`: Use only domain<br>`2`: Use domain, mxhost, and srvhost<br>`3`: Use all cname, domain, mxhost, and srvhost | local-data: |
 | add_local_fqdn | 0 | level | Each level puts a  more detailed router entry within the LAN DNS (except link).<br>`0`: Disabled<br>`1`: Host name on the primary address<br>`2`: Host name on all addresses<br>`3`: FQDN and host name on all addresses<br>`4`: FQDN defined by "iface.hostname.domain" |  local-zone: local-data: |
+| add_search | (empty) | | Additional zones to add to `/etc/resolv.conf`'s `search` directive | - |
 | add_wan_fqdn | 0 | level | Same as `add_local_fqdn` but on WAN as listed in `iface_wan` | local-zone: local-data: |
 | dns64 | 0 | boolean | Enable DNS64 RFC6052 to bridge IPv4 and IPv6 networks. | module: dns64 |
 | dns64_prefix | 64:ff9b::/96 | subnet | DNS64 RFC6052 IPv4 in IPv6 well known prefix. | dns64-prefix: |

net/unbound/files/unbound.sh

@@ -1375,6 +1375,7 @@ unbound_uci() {
 
   config_get UB_TTL_MIN     "$cfg" ttl_min 120
   config_get UB_TXT_DOMAIN  "$cfg" domain lan
+  config_get UB_ADD_SEARCH  "$cfg" add_search ''
   config_get UB_NEG_TTL_MAX "$cfg" ttl_neg_max 1000
 
   config_list_foreach "$cfg" domain_insecure bundle_domain_insecure
@@ -1565,7 +1566,12 @@ resolv_setup() {
       echo "# $UB_RESOLV_CONF generated by Unbound UCI $( date -Is )"
       echo "nameserver 127.0.0.1"
       echo "nameserver ::1"
-      echo "search $UB_TXT_DOMAIN."
+      echo -n "search"
+      local domain
+      for domain in $UB_ADD_SEARCH; do
+        echo -n " ${domain%.}."
+      done
+      echo " $UB_TXT_DOMAIN."
     } > $UB_RESOLV_CONF
   fi
 }