ovpnmain.cgi: Fix IP address calculation with static pools

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/core/190/filelists/files b/config/rootfiles/core/190/filelists/files
index dd820891d6420fe423648c29b23a399bd5a24cef..61317e49582e23e714167456b6302985bce9c713 100644 (file)
--- a/config/rootfiles/core/190/filelists/files
+++ b/config/rootfiles/core/190/filelists/files
@@ -3,5 +3,6 @@ etc/collectd.d
 etc/rc.d/init.d/collectd
 srv/web/ipfire/cgi-bin/index.cgi
 srv/web/ipfire/cgi-bin/logs.cgi/log.dat
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
 var/ipfire/network-functions.pl

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 72695f892f3dfb24c0ff51ce2c6930d87d93e1a8..daaa059a49e67a5f7ecbb452cc365808e28c5905 100755 (executable)
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -569,7 +569,7 @@ sub getccdadresses
        for (my $i=1;$i<=$count;$i++) {
                my $tmpip=$iprange[$i-1];
                my $stepper=$i*4;
-               $iprange[$i]= &General::getnextip($tmpip,4);
+               $iprange[$i]= &Network::bin2ip(&Network::ip2bin($tmpip) + 4);
        }
        my $r=0;
        foreach my $key (keys %ccdhash) {