summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-03-23 11:26:47 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-03-23 11:26:47 +0000
commit322039038fc82e8a03abc7bb6d4af1c64f279f57 (patch)
treed384531a370b1bc8f6e371f3bad449f240867984
parenta727e68c1f777ead7201fae6d5cd14ef18b2d064 (diff)
[package] dnsmasq: add missing config_get, localize variables, bump package revision
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31058 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/dnsmasq/Makefile4
-rw-r--r--package/dnsmasq/files/dnsmasq.init2
2 files changed, 4 insertions, 2 deletions
diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index a23e9ff795..9fc70b3daf 100644
--- 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 edd22ad3eb..75a57e72c3 100644
--- 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