From: Erik Kapfer <erik.kapfer@ipfire.org>
Date: Thu, 21 Jun 2018 09:12:53 +0000 (+0200)
Subject: OpenVPN: Prevent internal server error cause of bad header wrapper
X-Git-Tag: v2.21-core123~76^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8ae4010b312830bce82721325f0aeae524b2810a;p=people%2Fpmueller%2Fipfire-2.x.git

OpenVPN: Prevent internal server error cause of bad header wrapper

This fixes #11772 .

If the X509 are deleted, the openvpnctrl output generates a bad header wrapper error from the CGI
which causes an internal server error. The redirection of the openvpnctrl output fixes this.

Signed-off-by: Erik Kapfer <erik.kapfer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 4bc3473abf..5cd19a0f38 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -1181,7 +1181,7 @@ SETTINGS_ERROR:
 	    delete $confighash{$cgiparams{'$key'}};
 	}
 
-	system ("/usr/local/bin/openvpnctrl -drrd $name");
+	system ("/usr/local/bin/openvpnctrl -drrd $name &>/dev/null");
     }
     while ($file = glob("${General::swroot}/ovpn/ca/*")) {
 	unlink $file;