From 504620931254f4a484b089f593ca631339373152 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Thu, 28 Aug 2014 06:27:53 +0000 Subject: dnsmasq: Fix hosts file format when MAC address is not specified An entry like this in /etc/config/dhcp: config 'host' option 'name' 'pc2' option 'ip' '192.168.100.56' option 'dns' '1' results in a /tmp/hosts/dhcp entry that looks like this: 192.168.100.56 .lan Obviously it should say "pc2.lan". This happens because $name is set to "" in order to support the MAC-less syntax: "--dhcp-host=lap,192.168.0.199". Fix this by reordering the operations. Also, refuse to add a DNS entry if the hostname or IP is missing. Fixes #17683 Reported-by: Kostas Papadopoulos Signed-off-by: Kevin Cernekee SVN-Revision: 42319 --- package/network/services/dnsmasq/files/dnsmasq.init | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'package/network/services/dnsmasq') diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init index c2704e4..06d8c84 100644 --- a/package/network/services/dnsmasq/files/dnsmasq.init +++ b/package/network/services/dnsmasq/files/dnsmasq.init @@ -293,6 +293,11 @@ dhcp_host_add() { config_get ip "$cfg" ip [ -n "$ip" -o -n "$name" ] || return 0 + config_get_bool dns "$cfg" dns 0 + [ "$dns" = "1" -a -n "$ip" -a -n "$name" ] && { + echo "$ip $name${DOMAIN:+.$DOMAIN}" >> $HOSTFILE + } + config_get mac "$cfg" mac [ -z "$mac" ] && { [ -n "$name" ] || return 0 @@ -309,11 +314,6 @@ dhcp_host_add() { [ "$broadcast" = "0" ] && broadcast= xappend "--dhcp-host=$macs${networkid:+,net:$networkid}${broadcast:+,set:needs-broadcast}${tag:+,set:$tag}${ip:+,$ip}${name:+,$name}" - - config_get_bool dns "$cfg" dns 0 - [ "$dns" = "1" ] && { - echo "$ip $name${DOMAIN:+.$DOMAIN}" >> $HOSTFILE - } } dhcp_tag_add() { -- cgit v1.1