From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 22 Nov 2009 11:54:05 +0000 (+0000)
Subject: merge r18470
X-Git-Tag: 8.09.2~2
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=32b6c5ced942424e28288ee79ebde0fcdf59e167;p=openwrt%2Fsvn-archive%2Fopenwrt.git

merge r18470

SVN-Revision: 18471
---

diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index 5b712ed40c..44de5d6a5c 100644
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmasq
 PKG_VERSION:=2.47
-PKG_RELEASE:=3.2
+PKG_RELEASE:=3.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 3f8dca959c..05335de5c4 100644
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -44,6 +44,10 @@ append_interface() {
 	append args "-i $1"
 }
 
+append_addnhosts() {
+	append args "-H $1"
+}
+
 dnsmasq() {
 	local cfg="$1"
 	append_bool "$cfg" authoritative "-K"
@@ -67,12 +71,12 @@ dnsmasq() {
 	append_parm "$cfg" port "-p"
 	append_parm "$cfg" ednspacket_max "-P"
 	append_parm "$cfg" dhcpleasemax "-X"
-	append_parm "$cfg" "addnhosts" "-H"
 	append_parm "$cfg" "queryport" "-Q"
 	append_parm "$cfg" "domain" "-s"
 	append_parm "$cfg" "local" "-S"
 	config_list_foreach "$cfg" "server" append_server
 	config_list_foreach "$cfg" "interface" append_interface
+	config_list_foreach "$cfg" "addnhosts" append_addnhosts
 	append_parm "$cfg" "leasefile" "-l"
 	append_parm "$cfg" "resolvfile" "-r"
 	append_parm "$cfg" "tftp_root" "--tftp-root"