]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
OpenVPN: Stop N2N connection before remove.
authorErik Kapfer <ummeegge@ipfire.org>
Tue, 24 Mar 2020 10:29:05 +0000 (11:29 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 26 Mar 2020 09:44:03 +0000 (09:44 +0000)
Fix #12334

Signed-off-by: Erik Kapfer <ummeegge@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
html/cgi-bin/ovpnmain.cgi

index e76a688fe7dcda0b77bf716eb2538342cd775b00..a6fdd6d75a547ec40953d8f9e36b60f27902b98a 100644 (file)
@@ -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");