AA: dnsmasq: backport latest version from trunk

[12.09/openwrt.git] / package / dnsmasq / files / dnsmasq.init

diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index 5d5d97f..cc5ff7d 100644 (file)
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -96,6 +96,7 @@ dnsmasq() {
        append_bool "$cfg" enable_tftp "--enable-tftp"
        append_bool "$cfg" nonwildcard "--bind-interfaces"
        append_bool "$cfg" fqdn "--dhcp-fqdn"
+       append_bool "$cfg" proxydnssec "--proxy-dnssec"
 
        append_parm "$cfg" dhcpscript "--dhcp-script"
        append_parm "$cfg" cachesize "--cache-size"
@@ -256,10 +257,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