From: Nicolas Thill <nico@openwrt.org>
Date: Wed, 11 Aug 2010 10:37:33 +0000 (+0000)
Subject: package/dnsmasq: add support for bogus-nxdomain (thanks to Mickey Knox), bump release... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=46016457c292747652907516b6bd58081bc42894;p=openwrt%2Fstaging%2Fjow.git

package/dnsmasq: add support for bogus-nxdomain (thanks to Mickey Knox), bump release number

SVN-Revision: 22592
---

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"