luci: fix lost logic

luci-app-passwall/Makefile

@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-passwall
 PKG_VERSION:=4.62
-PKG_RELEASE:=6
+PKG_RELEASE:=7
 
 PKG_CONFIG_DEPENDS:= \
 	CONFIG_PACKAGE_$(PKG_NAME)_Iptables_Transparent_Proxy \

luci-app-passwall/root/usr/share/passwall/app.sh

@@ -1063,6 +1063,7 @@ start_dns() {
 	DNSMASQ_FILTER_IPV6=$FILTER_PROXY_IPV6
 
 	echolog "过滤服务配置：准备接管域名解析..."
+	[ "$ENABLED_ACLS" == 1 ] && {
 		local items=$(uci show ${CONFIG} | grep "=acl_rule" | cut -d '.' -sf 2 | cut -d '=' -sf 1)
 		[ -n "$items" ] && {
 			for item in $items; do
@@ -1087,6 +1088,7 @@ start_dns() {
 				}
 			done
 		}
+	}
 
 	case "$DNS_MODE" in
 	dns2socks)

luci-app-passwall/root/usr/share/passwall/helper_dnsmasq_add.lua

@@ -163,11 +163,11 @@ local gfwlist = PROXY_MODE:find("gfwlist")
 local only_global
 
 local dnsmasq_default_dns
-if CHNROUTE_MODE_DEFAULT_DNS ~= "nil" and (chnlist or gfwlist) then
-	if CHNROUTE_MODE_DEFAULT_DNS == "remote" then
+if CHNROUTE_MODE_DEFAULT_DNS ~= "nil" then
+	if chnlist and CHNROUTE_MODE_DEFAULT_DNS == "remote" then
 		dnsmasq_default_dns = TUN_DNS
 	end
-	if CHNROUTE_MODE_DEFAULT_DNS == "chinadns_ng" and CHINADNS_DNS ~= "0" then
+	if (chnlist or gfwlist) and CHNROUTE_MODE_DEFAULT_DNS == "chinadns_ng" and CHINADNS_DNS ~= "0" then
 		dnsmasq_default_dns = CHINADNS_DNS
 	end
 end