From d8c53a62158ee907744025fd62730048695f58d3 Mon Sep 17 00:00:00 2001 From: Nick Peng Date: Thu, 1 Sep 2022 00:32:52 +0800 Subject: [PATCH] luci: fix second dns force AAAA soa options not working issue. --- .../luci-compat/files/luci/model/cbi/smartdns/smartdns.lua | 2 +- .../root/www/luci-static/resources/view/smartdns/smartdns.js | 2 +- package/openwrt/files/etc/init.d/smartdns | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/luci-compat/files/luci/model/cbi/smartdns/smartdns.lua b/package/luci-compat/files/luci/model/cbi/smartdns/smartdns.lua index 6d7b0bb..f55c4eb 100644 --- a/package/luci-compat/files/luci/model/cbi/smartdns/smartdns.lua +++ b/package/luci-compat/files/luci/model/cbi/smartdns/smartdns.lua @@ -231,7 +231,7 @@ o.cfgvalue = function(...) end ---- Force AAAA SOA -o = s:taboption("seconddns", Flag, "force_aaaa_soa", translate("Force AAAA SOA"), translate("Force AAAA SOA.")) +o = s:taboption("seconddns", Flag, "seconddns_force_aaaa_soa", translate("Force AAAA SOA"), translate("Force AAAA SOA.")) o.rmempty = false o.default = o.disabled o.cfgvalue = function(...) diff --git a/package/luci/files/root/www/luci-static/resources/view/smartdns/smartdns.js b/package/luci/files/root/www/luci-static/resources/view/smartdns/smartdns.js index 9796beb..9ea9932 100644 --- a/package/luci/files/root/www/luci-static/resources/view/smartdns/smartdns.js +++ b/package/luci/files/root/www/luci-static/resources/view/smartdns/smartdns.js @@ -270,7 +270,7 @@ o.default = o.disabled; // Force AAAA SOA - o = s.taboption("seconddns", form.Flag, "force_aaaa_soa", _("Force AAAA SOA"), _("Force AAAA SOA.")); + o = s.taboption("seconddns", form.Flag, "seconddns_force_aaaa_soa", _("Force AAAA SOA"), _("Force AAAA SOA.")); o.rmempty = false; o.default = o.disabled; diff --git a/package/openwrt/files/etc/init.d/smartdns b/package/openwrt/files/etc/init.d/smartdns index edc31d3..28fc67e 100644 --- a/package/openwrt/files/etc/init.d/smartdns +++ b/package/openwrt/files/etc/init.d/smartdns @@ -252,8 +252,8 @@ load_second_server() config_get_bool seconddns_no_cache "$section" "seconddns_no_cache" "0" [ "$seconddns_no_cache" = "1" ] && ARGS="$ARGS -no-cache" - config_get_bool force_aaaa_soa "$section" "force_aaaa_soa" "0" - [ "$force_aaaa_soa" = "1" ] && ARGS="$ARGS -force-aaaa-soa" + config_get_bool seconddns_force_aaaa_soa "$section" "seconddns_force_aaaa_soa" "0" + [ "$seconddns_force_aaaa_soa" = "1" ] && ARGS="$ARGS -force-aaaa-soa" config_get ipv6_server "$section" "ipv6_server" "1" if [ "$ipv6_server" = "1" ]; then