From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 16 Apr 2010 19:09:39 +0000 (+0000)
Subject: [backfire] merge r20935
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=dc493fac54dbd2855f5791adf70148a8a8eb92aa

[backfire] merge r20935

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@20936 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index 895a5c295..abf0962c3 100644
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmasq
 PKG_VERSION:=2.52
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index 4cd941cfd..47c4c2d2e 100644
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -296,9 +296,9 @@ dhcp_domain_add() {
 	local raddr="${4:+$4.$3.$2.$1.in-addr.arpa}"
 
 	for name in $names; do
-		append args "-A /$name${DOMAIN:+.$DOMAIN}/$ip"
+		append args "-A /$name/$ip"
 		[ -n "$raddr" ] && \
-			append args "--ptr-record=$raddr,$name${DOMAIN:+.$DOMAIN}"
+			append args "--ptr-record=$raddr,$name"
 	done
 }