dnsmasq: Create rDNS records for LuCI "Hostnames"

LuCI creates "domain" UCI config sections, which the dnsmasq init file
then, currently, translates into "address" config lines. This is not
the correct usage of "address" (see r36943), and also causes rDNS
records to not be created. This patches dnsmasq.init to utilize the
additional hosts file introduced in r40799 for such domain names,
resolving both issues.

Signed-off-by: Tyler Fenby <tylerf@securecominc.com>

Backport of r42318

git-svn-id: svn://svn.openwrt.org/openwrt/branches/barrier_breaker@42388 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
blogic 2014-09-01 13:22:05 +00:00
parent b402d2d109
commit abd77939b4
1 changed files with 3 additions and 6 deletions

View File

@ -441,13 +441,10 @@ dhcp_domain_add() {
[ -n "$ip" ] || return 0
for name in $names; do
[ "${name%.*}" == "$name" ] && \
name="$name${DOMAIN:+.$DOMAIN}"
record="${record:+$record/}$name"
record="${record:+$record }$name"
done
xappend "--address=/$record/$ip"
echo "$ip $record" >> $HOSTFILE
}
dhcp_srv_add() {
@ -572,7 +569,7 @@ start_service() {
local lanaddr
[ $ADD_LOCAL_HOSTNAME -eq 1 ] && network_get_ipaddr lanaddr "lan" && {
local hostname="$(uci_get system @system[0] hostname OpenWrt)"
dhcp_hostrecord_add "" "${hostname%.$DOMAIN}${DOMAIN:+.$DOMAIN ${hostname%.$DOMAIN}}" "$lanaddr"
dhcp_domain_add "" "$hostname" "$lanaddr"
}
echo >> $CONFIGFILE