Merge remote-tracking branch 'ms/dns-forwarding' into next

This commit is contained in:
Michael Tremer
2019-03-11 15:57:15 +00:00
13 changed files with 77 additions and 6 deletions

View File

@@ -197,8 +197,8 @@ write_forward_conf() {
local insecure_zones="${INSECURE_ZONES}"
local enabled zone server servers remark
while IFS="," read -r enabled zone servers remark; do
local enabled zone server servers remark disable_dnssec rest
while IFS="," read -r enabled zone servers remark disable_dnssec rest; do
# Line must be enabled.
[ "${enabled}" = "on" ] || continue
@@ -208,6 +208,11 @@ write_forward_conf() {
*.local)
insecure_zones="${insecure_zones} ${zone}"
;;
*)
if [ "${disable_dnssec}" = "on" ]; then
insecure_zones="${insecure_zones} ${zone}"
fi
;;
esac
# Reverse-lookup zones must be stubs