From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 2 Jan 2013 15:14:19 +0000 (+0000)
Subject: dnsmasq: allow dhcp host entries without mac addresses (#11928)
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=54c0b40427a0398ed1c0cd1cf24fe11169246499;p=openwrt%2Fstaging%2Fblocktrron.git

dnsmasq: allow dhcp host entries without mac addresses (#11928)

SVN-Revision: 34971
---

diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile
index d92b00f998..26670e5d53 100644
--- a/package/network/services/dnsmasq/Makefile
+++ b/package/network/services/dnsmasq/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2012 OpenWrt.org
+# Copyright (C) 2006-2013 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.62
-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/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init
index 85c22c3745..f2e111bed5 100644
--- a/package/network/services/dnsmasq/files/dnsmasq.init
+++ b/package/network/services/dnsmasq/files/dnsmasq.init
@@ -253,10 +253,15 @@ dhcp_host_add() {
 	config_get ip "$cfg" ip
 	[ -n "$ip" -o -n "$name" ] || return 0
 
-	macs=""
 	config_get mac "$cfg" mac
+	[ -z "$mac" ] && {
+		[ -n "$name" ] || return 0
+		mac="$name"
+		name=""
+	}
+
+	macs=""
 	for m in $mac; do append macs "$m" ","; done
-	[ -n "$macs" ] || return 0
 
 	config_get tag "$cfg" tag