hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34971 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Jo-Philipp Wich 2013-01-02 15:14:19 +00:00
parent 090f7dbbad
commit 64324ccfca
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/network/services/dnsmasq/Makefile
View File

@ -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. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=dnsmasq PKG_NAME:=dnsmasq
PKG_VERSION:=2.62 PKG_VERSION:=2.62
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq

9
package/network/services/dnsmasq/files/dnsmasq.init
View File

@ -253,10 +253,15 @@ dhcp_host_add() {
config_get ip "$cfg" ip config_get ip "$cfg" ip
[ -n "$ip" -o -n "$name" ] || return 0 [ -n "$ip" -o -n "$name" ] || return 0
macs=""
config_get mac "$cfg" mac config_get mac "$cfg" mac
[ -z "$mac" ] && {
[ -n "$name" ] || return 0
mac="$name"
name=""
}
macs=""
for m in $mac; do append macs "$m" ","; done for m in $mac; do append macs "$m" ","; done
[ -n "$macs" ] || return 0
config_get tag "$cfg" tag config_get tag "$cfg" tag