[2/2] ovpnmain.cgi: Call correct system_output() function.

Message ID 20210621154506.2482-2-stefan.schantl@ipfire.org
State New
Headers show
Series [1/2] ovpnmain.cgi: Fix detection of used DH key lenght. | expand

Commit Message

Stefan Schantl June 21, 2021, 3:45 p.m. UTC
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
---
 html/cgi-bin/ovpnmain.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Michael Tremer June 21, 2021, 7:45 p.m. UTC | #1
Hello,

This won’t apply and I don’t know why :(

-Michael

> On 21 Jun 2021, at 16:45, Stefan Schantl <stefan.schantl@ipfire.org> wrote:
> 
> Signed-off-by: Stefan Schantl <stefan.schantl@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 5af1b807e..7a2833ce6 100644
> --- a/html/cgi-bin/ovpnmain.cgi
> +++ b/html/cgi-bin/ovpnmain.cgi
> @@ -5764,7 +5764,7 @@ END
> 
>     # Adding DH parameter to chart
>     if (-f "${General::swroot}/ovpn/ca/dh1024.pem") {
> -		my @dhsubject = &System_output("/usr/bin/openssl", "dhparam", "-text", "-in", "${General::swroot}/ovpn/ca/dh1024.pem");
> +		my @dhsubject = &General::system_output("/usr/bin/openssl", "dhparam", "-text", "-in", "${General::swroot}/ovpn/ca/dh1024.pem");
> 		my $dhsubject;
> 
> 		foreach my $line (@dhsubject) {
> -- 
> 2.20.1
>

Patch

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 5af1b807e..7a2833ce6 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -5764,7 +5764,7 @@  END
 
     # Adding DH parameter to chart
     if (-f "${General::swroot}/ovpn/ca/dh1024.pem") {
-		my @dhsubject = &System_output("/usr/bin/openssl", "dhparam", "-text", "-in", "${General::swroot}/ovpn/ca/dh1024.pem");
+		my @dhsubject = &General::system_output("/usr/bin/openssl", "dhparam", "-text", "-in", "${General::swroot}/ovpn/ca/dh1024.pem");
 		my $dhsubject;
 
 		foreach my $line (@dhsubject) {