X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/3243b6b119e16268bfb619ad6e5d0e497aecb7a9..91fda1c4e6b97bfa8824cd95f8fea823d7c70ad6:/package/dnsmasq/files/dnsmasq.init diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init index 3509d9473..15f856d4e 100644 --- a/package/dnsmasq/files/dnsmasq.init +++ b/package/dnsmasq/files/dnsmasq.init @@ -263,7 +263,7 @@ dhcp_add() { leasetime="${leasetime:-12h}" start="$(dhcp_calc "${start:-100}")" - limit="$(${limit:-150})" + limit="${limit:-150}" eval "$(ipcalc.sh $ipaddr $netmask $start $limit)" if [ "$dynamicdhcp" = "0" ]; then END="static"; fi append args "--dhcp-range=$networkid,$START,$END,$NETMASK,$leasetime${options:+ $options}" @@ -284,16 +284,30 @@ dhcp_option_add() { dhcp_domain_add() { local cfg="$1" + local ip name names - config_get name "$cfg" name - [ -n "$name" ] || return 0 + config_get names "$cfg" name + [ -n "$names" ] || return 0 config_get ip "$cfg" ip [ -n "$ip" ] || return 0 local oIFS="$IFS"; IFS="."; set -- $ip; IFS="$oIFS" - append args "-A /$name${DOMAIN:+.$DOMAIN}/$ip" - append args "--ptr-record=$4.$3.$2.$1.in-addr.arpa,$name${DOMAIN:+.$DOMAIN}" + local raddr="${4:+$4.$3.$2.$1.in-addr.arpa}" + + for name in $names; do + local fqdn="$name" + + [ "${fqdn%.*}" == "$fqdn" ] && \ + fqdn="$fqdn${DOMAIN:+.$DOMAIN}" + + append args "-A /$fqdn/$ip" + + [ -n "$raddr" ] && { + append args "--ptr-record=$raddr,$fqdn" + raddr="" + } + done } start() {