dnsmasq: add missing config_get, localize variables, bump package revision

SVN-Revision: 31058

diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index a23e9ff795232cffa3cf02c4b5755b62bb9d799b..9fc70b3daffe22626016003a4b62156d2bf1c150 100644 (file)
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2011 OpenWrt.org
+# Copyright (C) 2006-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmasq
 PKG_VERSION:=2.59
-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 edd22ad3eb238ad29ad751386d9ca0421e9f2e92..75a57e72c313e0b3d0c747125a184ac43e50e80d 100644 (file)
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -372,7 +372,9 @@ dhcp_srv_add() {
 
 dhcp_mx_add() {
        local cfg="$1"
+       local domain relay pref
 
+       config_get domain "$cfg" domain
        [ -n "$domain" ] || return 0
 
        config_get relay "$cfg" relay