aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2010-08-11 10:37:33 +0000
committerNicolas Thill <nico@openwrt.org>2010-08-11 10:37:33 +0000
commit9d8ace68e32670a4d52a763b2b895c129ef48837 (patch)
tree9c88b2a3de723c1e15120357414b6306664e89ed
parentf842b81b5c08135599a0bd0420853f34d856752d (diff)
downloadupstream-9d8ace68e32670a4d52a763b2b895c129ef48837.tar.gz
upstream-9d8ace68e32670a4d52a763b2b895c129ef48837.tar.bz2
upstream-9d8ace68e32670a4d52a763b2b895c129ef48837.zip
package/dnsmasq: add support for bogus-nxdomain (thanks to Mickey Knox), bump release number
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22592 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/dnsmasq/Makefile2
-rw-r--r--package/dnsmasq/files/dhcp.conf1
-rw-r--r--package/dnsmasq/files/dnsmasq.init5
3 files changed, 7 insertions, 1 deletions
diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index 977e109709..6654bd1f8e 100644
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=dnsmasq
PKG_VERSION:=2.55
-PKG_RELEASE:=3
+PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
diff --git a/package/dnsmasq/files/dhcp.conf b/package/dnsmasq/files/dhcp.conf
index c79458fb2b..cff08d482c 100644
--- a/package/dnsmasq/files/dhcp.conf
+++ b/package/dnsmasq/files/dhcp.conf
@@ -18,6 +18,7 @@ config dnsmasq
#option nonwildcard 1
#list interface br-lan
#list notinterface lo
+ #list bogusnxdomain '64.94.110.11'
config dhcp lan
option interface lan
diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index fac2d8a72d..0b74d419e5 100644
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -55,6 +55,10 @@ append_addnhosts() {
append args "-H $1"
}
+append_bogusnxdomain() {
+ append args "-B $1"
+}
+
dnsmasq() {
local cfg="$1"
append_bool "$cfg" authoritative "-K"
@@ -86,6 +90,7 @@ dnsmasq() {
config_list_foreach "$cfg" "interface" append_interface
config_list_foreach "$cfg" "notinterface" append_notinterface
config_list_foreach "$cfg" "addnhosts" append_addnhosts
+ config_list_foreach "$cfg" "bogusnxdomain" append_bogusnxdomain
append_parm "$cfg" "leasefile" "-l"
append_parm "$cfg" "resolvfile" "-r"
append_parm "$cfg" "tftp_root" "--tftp-root"