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 4bdbf1d..561f82a 100644 (file)
--- 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("<abbr title=\"Domain Name System\">DNS</abbr> 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