From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexander Marx To: development@lists.ipfire.org Subject: [PATCH] BUG11131: fix errormessage when more ipsec subnets defined Date: Thu, 02 Jun 2016 16:39:35 +0200 Message-ID: <1464878375-16503-1-git-send-email-alexander.marx@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5241468965386869000==" List-Id: --===============5241468965386869000== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Heino Gutschmidt When having more than one subnet in an ipsec connection it is not possible to create a new openvpn static subnet. Signed-off-by: Alexander Marx Signed-off-by: Heino Gutschmidt --- config/cfgroot/general-functions.pl | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-fun= ctions.pl index d3d7251..298e68c 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -516,12 +516,14 @@ sub checksubnets &General::readhasharray("${General::swroot}/vpn/config", \%ipsecconf); foreach my $key (keys %ipsecconf){ if ($ipsecconf{$key}[11] ne ''){ - my ($ipsecip,$ipsecsub) =3D split (/\//, $ipsecconf{$key}[11]); - $ipsecsub=3D&iporsubtodec($ipsecsub); - if($ipsecconf{$key}[1] ne $ccdname){ - if ( &IpInSubnet ($ip,$ipsecip,$ipsecsub) ){ - $errormessage=3D$Lang::tr{'ccd err isipsecnet'}." Name: $ipsecconf{$k= ey}[1]"; - return $errormessage; + foreach my $ipsecsubitem (split(/\|/, $ipsecconf{$key}[11])) { + my ($ipsecip,$ipsecsub) =3D split (/\//, $ipsecconf{$key}[11]); + $ipsecsub=3D&iporsubtodec($ipsecsub); + if($ipsecconf{$key}[1] ne $ccdname){ + if ( &IpInSubnet ($ip,$ipsecip,$ipsecsub) ){ + $errormessage=3D$Lang::tr{'ccd err isipsecnet'}." Name: $ipsecconf{$= key}[1]"; + return $errormessage; + } } } } --=20 2.7.4 --===============5241468965386869000==--