From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 25 Jan 2016 17:47:22 +0000 (+0000)
Subject: dnsmasq: Don't add local hostname if ula prefix is not specified
X-Git-Tag: reboot~638
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d8da5c5630928893122330f3042523438f5e2e3f;p=openwrt%2Fstaging%2Fnoltari.git

dnsmasq: Don't add local hostname if ula prefix is not specified

Commit 6a7e56b adds support for adding local hostname for own lan ula adress
but if ula prefix is not specified results into an invalid config (address=/OpenWrt.lan/1)
causing dnsmasq not to start up.
Use lanaddr6 when adding local hostname as the lan ula address is constructed based on the
UCI parameters ip6hint and ip6ifaceid and thus not always ula prefix suffixed with 1

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>

SVN-Revision: 48495
---

diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile
index de0237b314..89799eec6b 100644
--- a/package/network/services/dnsmasq/Makefile
+++ b/package/network/services/dnsmasq/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmasq
 PKG_VERSION:=2.75
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init
index efc96273a2..db342e7c8e 100644
--- a/package/network/services/dnsmasq/files/dnsmasq.init
+++ b/package/network/services/dnsmasq/files/dnsmasq.init
@@ -609,11 +609,11 @@ start_service() {
 			dhcp_domain_add "" "$hostname" "$lanaddr"
 		}
 
-		network_get_ipaddrs6 lanaddr6 "lan" && {
+		[ -n "$ulaprefix" ] && network_get_ipaddrs6 lanaddr6 "lan" && {
 			for lanaddr6 in $lanaddr6; do
 				case "$lanaddr6" in
 					"${ulaprefix%%:/*}"*)
-						dhcp_domain_add "" "$hostname" "${ulaprefix%%/*}1"
+						dhcp_domain_add "" "$hostname" "$lanaddr6"
 					;;
 				esac
 			done