On 26/08/2014 17:10, Tyler Fenby wrote:
> 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 <tyl...@securecominc.com> ---
>
>
> Sorry for being stupid and not understanding what John had meant
> about the whitespace.
>
the previous version had whitespace errors ... s/\t/ /g
this one is ok however so i am merging it.
John
>
> package/network/services/dnsmasq/files/dnsmasq.init | 9 +++------ 1
> file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/package/network/services/dnsmasq/files/dnsmasq.init
> b/package/network/services/dnsmasq/files/dnsmasq.init index
> 2ea73af..c2704e4 100644 ---
> a/package/network/services/dnsmasq/files/dnsmasq.init +++
> b/package/network/services/dnsmasq/files/dnsmasq.init @@ -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
>
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
