From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sat, 31 Oct 2015 11:21:16 +0000 (+0100)
Subject: ocserv: simplify IPv6 network setting
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3e0e8c38632788438cf66174f693457e3ee61bfa;p=feed%2Fpackages.git

ocserv: simplify IPv6 network setting

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
---

diff --git a/net/ocserv/files/ocserv.conf.template b/net/ocserv/files/ocserv.conf.template
index dce96d8325..8421012347 100644
--- a/net/ocserv/files/ocserv.conf.template
+++ b/net/ocserv/files/ocserv.conf.template
@@ -268,7 +268,6 @@ ipv4-netmask = |NETMASK|
 
 # The IPv6 subnet that leases will be given from.
 |ENABLE_IPV6|ipv6-network = |IPV6ADDR|
-|ENABLE_IPV6|ipv6-prefix = |IPV6PREFIX|
 
 # The domains over which the provided DNS should be used. Use
 # multiple lines for multiple domains.
diff --git a/net/ocserv/files/ocserv.init b/net/ocserv/files/ocserv.init
index d4d014dd8a..8fe5e9af96 100644
--- a/net/ocserv/files/ocserv.init
+++ b/net/ocserv/files/ocserv.init
@@ -31,9 +31,6 @@ setup_config() {
 	test -z $default_domain && enable_default_domain=""
 	test -z $ip6addr && enable_ipv6="#"
 
-	ipv6_addr=`echo $ip6addr|cut -d '/' -f 1`
-	ipv6_prefix=`echo $ip6addr|cut -d '/' -f 2`
-
 	test $auth = "plain" && authsuffix="\[passwd=/var/etc/ocpasswd\]"
 
 	dyndns="false"
@@ -55,8 +52,7 @@ setup_config() {
 	    -e "s/|COMPRESSION|/$enable_compression/g" \
 	    -e "s/|IPV4ADDR|/$ipaddr/g" \
 	    -e "s/|NETMASK|/$netmask/g" \
-	    -e "s/|IPV6ADDR|/$ipv6_addr/g" \
-	    -e "s/|IPV6PREFIX|/$ipv6_prefix/g" \
+	    -e "s#|IPV6ADDR|#$ip6addr#g" \
 	    -e "s/|ENABLE_IPV6|/$enable_ipv6/g" \
 	    /etc/ocserv/ocserv.conf.template > /var/etc/ocserv.conf
 }