From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 16 Apr 2010 19:09:05 +0000 (+0000)
Subject: dnsmasq: don't append search domain to custom host entries
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c876279bb2bbad7d21cfb7ea9185e7d4eb217e7f;p=openwrt%2Fstaging%2Fldir.git

dnsmasq: don't append search domain to custom host entries

SVN-Revision: 20935
---

diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index 895a5c2953..abf0962c37 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 4cd941cfd7..47c4c2d2e6 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
 }