From: Manuel Munz Date: Thu, 10 Nov 2011 11:41:44 +0000 (+0000) Subject: luci-0.10: Merge r7911 X-Git-Tag: 0.10.0~38 X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=8c97c5116fa7f3a7a5272bbb161f13aabeb16550 luci-0.10: Merge r7911 --- diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua b/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua index 4bdbf1dfc..561f82abd 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua @@ -79,6 +79,7 @@ s:taboption("advanced", Flag, "filterwin2k", translate("Filter useless"), translate("Do not forward requests that cannot be answered by public name servers")) + s:taboption("advanced", Flag, "localise_queries", translate("Localise queries"), translate("Localise hostname depending on the requesting subnet if multiple IPs are available")) @@ -104,6 +105,14 @@ s:taboption("advanced", Flag, "strictorder", translate("DNS servers will be queried in the " .. "order of the resolvfile")).optional = true + +bn = s:taboption("advanced", DynamicList, "bogusnxdomain", translate("Bogus NX Domain Override"), + translate("List of hosts that supply bogus NX domain results")) + +bn.optional = true +bn.placeholder = "67.215.65.132" + + s:taboption("general", Flag, "logqueries", translate("Log queries"), translate("Write received DNS requests to syslog")).optional = true