From: Hans Dedecker <dedeckeh@gmail.com>
Date: Thu, 8 Feb 2018 17:21:12 +0000 (+0100)
Subject: odhcp6c: fix appending of emtpy sendopt value (FS#1336)
X-Git-Tag: v18.06.0-rc1~1075
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=787326b43e332b378899205294b1d92ea77a45d4;ds=sidebyside

odhcp6c: fix appending of emtpy sendopt value (FS#1336)

Don't append an empty sendopts value as odhcp6c bails out
immediately on an empty -x option triggering an infinite start
loop of odhcp6c

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

diff --git a/package/network/ipv6/odhcp6c/Makefile b/package/network/ipv6/odhcp6c/Makefile
index ac793f1ad2..9989f80f1a 100644
--- a/package/network/ipv6/odhcp6c/Makefile
+++ b/package/network/ipv6/odhcp6c/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=odhcp6c
-PKG_RELEASE:=7
+PKG_RELEASE:=8
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/odhcp6c.git
diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.sh b/package/network/ipv6/odhcp6c/files/dhcpv6.sh
index bc7f01d322..5c2ee6b988 100755
--- a/package/network/ipv6/odhcp6c/files/dhcpv6.sh
+++ b/package/network/ipv6/odhcp6c/files/dhcpv6.sh
@@ -77,7 +77,7 @@ proto_dhcpv6_setup() {
 
 	sendopts_cb() {
 		local val="$1"
-		append opts "-x$val"
+		[ -n "$val" ] && append opts "-x$val"
 	}
 
 	json_for_each_item sendopts_cb sendopts