From 1660376c9d34901fef82e34ea03c1e59efca17a5 Mon Sep 17 00:00:00 2001
From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 16 Jul 2010 01:00:16 +0000
Subject: [PATCH] [backfire] merge r21523, r21871 & r22222

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@22223 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/dnsmasq/Makefile           |  6 +++---
 package/dnsmasq/files/dhcp.conf    |  5 ++++-
 package/dnsmasq/files/dnsmasq.init | 23 +++++++++++++++++++++++
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index 77b8f82a6..852b126fc 100644
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmasq
-PKG_VERSION:=2.52
-PKG_RELEASE:=4
+PKG_VERSION:=2.55
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
-PKG_MD5SUM:=1bb32fffdb4f977ead607802b5d701d0
+PKG_MD5SUM:=b093d7c6bc7f97ae6fd35d048529232a
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/dnsmasq/files/dhcp.conf b/package/dnsmasq/files/dhcp.conf
index 25ecde6f5..c79458fb2 100644
--- a/package/dnsmasq/files/dhcp.conf
+++ b/package/dnsmasq/files/dhcp.conf
@@ -1,8 +1,11 @@
 config dnsmasq
 	option domainneeded	1
 	option boguspriv	1
-	option filterwin2k	'0'  #enable for dial on demand
+	option filterwin2k	0  # enable for dial on demand
 	option localise_queries	1
+	option rebind_protection 1  # disable if upstream must serve RFC1918 addresses
+	option rebind_localhost 0  # enable for RBL checking and similar services
+	#list rebind_domain example.lan  # whitelist RFC1918 responses for domains
 	option local	'/lan/'
 	option domain	'lan'
 	option expandhosts	1
diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index 15f856d4e..4e0bbf921 100644
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -99,6 +99,29 @@ dnsmasq() {
 
 	config_get hostsfile "$cfg" dhcphostsfile
 	[ -e "$hostsfile" ] && append args "--dhcp-hostsfile=$hostsfile"
+
+	local rebind
+	config_get_bool rebind "$cfg" rebind_protection 1
+	[ $rebind -gt 0 ] && {
+		logger -t dnsmasq \
+			"DNS rebinding protection is active," \
+			"will discard upstream RFC1918 responses!"
+		append args "--stop-dns-rebind"
+
+		local rebind_localhost
+		config_get_bool rebind_localhost "$cfg" rebind_localhost 0
+		[ $rebind_localhost -gt 0 ] && {
+			logger -t dnsmasq "Allowing 127.0.0.0/8 responses"
+			append args "--rebind-localhost-ok"
+		}
+
+		append_rebind_domain() {
+			logger -t dnsmasq "Allowing RFC1918 responses for domain $1"
+			append args "--rebind-domain-ok=$1"
+		}
+
+		config_list_foreach "$cfg" rebind_domain append_rebind_domain
+	}
 }
 
 dhcp_subscrid_add() {
-- 
2.35.1