aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-04-16 19:09:05 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-04-16 19:09:05 +0000
commit9ab8828d63e162a95143cd665c1abe59eb89c339 (patch)
treed7a2be8954bd59032178daa0f3cd41852f08cc35
parent8a102d765b2c2be7b2a70ee739c5b633f73417e1 (diff)
downloadupstream-9ab8828d63e162a95143cd665c1abe59eb89c339.tar.gz
upstream-9ab8828d63e162a95143cd665c1abe59eb89c339.tar.bz2
upstream-9ab8828d63e162a95143cd665c1abe59eb89c339.zip
[package] dnsmasq: don't append search domain to custom host entries
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20935 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/dnsmasq/Makefile2
-rw-r--r--package/dnsmasq/files/dnsmasq.init4
2 files changed, 3 insertions, 3 deletions
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
}