From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] OpenVPN: Stop N2N connection before remove.
Date: Tue, 24 Mar 2020 14:42:15 +0000
Message-ID: <9E30F9DE-DABE-4AFF-B4A5-6A492421A265@ipfire.org>
In-Reply-To: <4931c9e124fe7a63fc6dfd5339616fc15497918e.camel@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3701948526846381362=="
List-Id: <development.lists.ipfire.org>

--===============3701948526846381362==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Yes, please. If we spot a bug, we should of course fix it :)

> On 24 Mar 2020, at 12:31, ummeegge <ummeegge(a)ipfire.org> wrote:
>=20
> Hi Michael,
>=20
> Am Dienstag, den 24.03.2020, 11:31 +0000 schrieb Michael Tremer:
>> Hello,
>>=20
>> Brilliant fix. Thanks for looking into this so quickly.
> your welcome.
>=20
>>=20
>> Did you check if we have any other issues like this?
> Not similar to that one as far as i can see.
> This one -->
> https://git.ipfire.org/?p=3Dipfire-2.x.git;a=3Dblob;f=3Dhtml/cgi-bin/ovpnma=
in.cgi;hb=3D91457877199d3ac8438efc7be4cd6a50e48e37e4#l1221
> comes closer but it works.
> Should i nevertheless ?
>=20
> Best,
>=20
> Erik
>=20
>>=20
>> Best,
>> -Michael
>>=20
>> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
>>=20
>>> On 24 Mar 2020, at 10:29, Erik Kapfer <ummeegge(a)ipfire.org> wrote:
>>>=20
>>> Fix #12334
>>>=20
>>> Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org>
>>> ---
>>> html/cgi-bin/ovpnmain.cgi | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>=20
>>> diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
>>> index e76a688fe..a6fdd6d75 100644
>>> --- a/html/cgi-bin/ovpnmain.cgi
>>> +++ b/html/cgi-bin/ovpnmain.cgi
>>> @@ -2464,7 +2464,7 @@ else
>>>=20
>>> 		if ($confighash{$cgiparams{'KEY'}}[3] eq 'net') {
>>> 			# Stop the N2N connection before it is removed
>>> -			system("/usr/local/bin/openvpnctrl -kn2n
>>> $confighash{$cgiparams{'KEY'}}[1] &>/dev/null");
>>> +			system('/usr/local/bin/openvpnctrl', '-kn2n',
>>> $confighash{$cgiparams{'KEY'}}[1]);
>>>=20
>>> 			my $conffile =3D
>>> glob("${General::swroot}/ovpn/n2nconf/$confighash{$cgiparams{'KEY'}
>>> }[1]/$confighash{$cgiparams{'KEY'}}[1].conf");
>>> 			my $certfile =3D
>>> glob("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[
>>> 1].p12");
>>> --=20
>>> 2.12.2
>>>=20
>>=20
>>=20
>=20


--===============3701948526846381362==--