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 [thread overview]
Message-ID: <6E28752D-324D-453E-9544-47C4A7D98C48@ipfire.org> (raw)
In-Reply-To: <20200324102905.27038-1-ummeegge@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 1214 bytes --]
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:
>
> Fix #12334
>
> Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org>
> ---
> html/cgi-bin/ovpnmain.cgi | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> 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
>
> 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]);
>
> my $conffile = glob("${General::swroot}/ovpn/n2nconf/$confighash{$cgiparams{'KEY'}}[1]/$confighash{$cgiparams{'KEY'}}[1].conf");
> my $certfile = glob("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12");
> --
> 2.12.2
>
next prev parent reply other threads:[~2020-03-24 11:31 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-24 10:29 Erik Kapfer
2020-03-24 11:31 ` Michael Tremer [this message]
2020-03-24 12:31 ` ummeegge
2020-03-24 14:42 ` Michael Tremer
2020-03-25 12:09 ` ummeegge
2020-03-25 17:48 ` ummeegge
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6E28752D-324D-453E-9544-47C4A7D98C48@ipfire.org \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox