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 dce96d832598cd49c7b59ee51dc1b64573132718..84210123471a517969b312da5e7a818d5a8275a4 100644 (file)
--- 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 c4597a40f25c5bf22a1d92a2d4863c78fca8ae58..73f73514d3c9e3d62b99c62c71b423aa76d3bc46 100644 (file)
--- a/net/ocserv/files/ocserv.init
+++ b/net/ocserv/files/ocserv.init
@@ -30,9 +30,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"
@@ -54,8 +51,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
 }