ovpnmain.cgi: Fix IP address calculation with static pools

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

diff --git a/config/rootfiles/core/189/filelists/files b/config/rootfiles/core/189/filelists/files
index 7afa1ac2e94f71f2de56ce574540b22698d5b6cc..7e79598862efc68e7014265ffd27c8a31dc770bc 100644 (file)
--- a/config/rootfiles/core/189/filelists/files
+++ b/config/rootfiles/core/189/filelists/files
@@ -5,6 +5,7 @@ etc/rc.d/init.d/networking/functions.network
 etc/rc.d/init.d/suricata
 srv/web/ipfire/cgi-bin/getrrdimage.cgi
 srv/web/ipfire/cgi-bin/ids.cgi
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
 srv/web/ipfire/html/include/rrdimage.js
 usr/bin/suricata-watcher
 var/ipfire/graphs.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) {