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 11:31:03 +0000
Message-ID: <6E28752D-324D-453E-9544-47C4A7D98C48@ipfire.org>
In-Reply-To: <20200324102905.27038-1-ummeegge@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============9138031746047527662=="
List-Id: <development.lists.ipfire.org>

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

Hello,

Brilliant fix. Thanks for looking into this so quickly.

Did you check if we have any other issues like this?

Best,
-Michael

Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>

> 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{'K=
EY'}}[1]);
>=20
> 			my $conffile =3D glob("${General::swroot}/ovpn/n2nconf/$confighash{$cgip=
arams{'KEY'}}[1]/$confighash{$cgiparams{'KEY'}}[1].conf");
> 			my $certfile =3D glob("${General::swroot}/ovpn/certs/$confighash{$cgipar=
ams{'KEY'}}[1].p12");
> --=20
> 2.12.2
>=20


--===============9138031746047527662==--