[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 274ca65bc5ef66fb98e7543789d94408915878d1

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 274ca65bc5ef66fb98e7543789d94408915878d1

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 3683 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, master has been updated
       via  274ca65bc5ef66fb98e7543789d94408915878d1 (commit)
       via  b959b9f5a6a838bef737955bcd5e97ef2c96d598 (commit)
      from  27ca856f728c840d90130abd41576ef57e65eae5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 274ca65bc5ef66fb98e7543789d94408915878d1
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Tue Jun 22 14:56:52 2021 +0200

    ovpnmain.cgi: Fix typos.
    
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit b959b9f5a6a838bef737955bcd5e97ef2c96d598
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Tue Jun 22 14:52:36 2021 +0200

    ovpnmain.cgi: Call correct system_output() function.
    
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 html/cgi-bin/ovpnmain.cgi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Difference in files:
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index d9e26de2f..7a2833ce6 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -1235,7 +1235,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq '' && $cg
   if ( $vpnsettings{'ENABLED_BLUE'} eq 'on' ) {
 	  &General::system("touch", "${General::swroot}/ovpn/enable_blue");
   } else {
-	  unlink(${General::swroot}/ovpn/enable_blue);
+	  unlink("${General::swroot}/ovpn/enable_blue");
   }
 
   if ( $vpnsettings{'ENABLED_ORANGE'} eq 'on' ) {
@@ -1497,7 +1497,7 @@ END
 	}
     }
 
-    @casubject = &General::system_output("/usr/bin/openssl", "x509", "-text", "-in", "${General::swroot}/ovpn/ca/$cgiparams{'CA_NAME'}cert.pem");
+    my @casubject = &General::system_output("/usr/bin/openssl", "x509", "-text", "-in", "${General::swroot}/ovpn/ca/$cgiparams{'CA_NAME'}cert.pem");
     my $casubject;
 
     foreach my $line (@casubject) {
@@ -2526,7 +2526,7 @@ else
 
 	if ($confighash{$cgiparams{'KEY'}}) {
 		# Revoke certificate if certificate was deleted and rewrite the CRL
-		&General::system("/usr/bin/openssl", "ca", "-revoke", "${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem", "-config", "${General::swroot}/ovpn/openssl/ovpn.cnf)";
+		&General::system("/usr/bin/openssl", "ca", "-revoke", "${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem", "-config", "${General::swroot}/ovpn/openssl/ovpn.cnf");
 		&General::system("/usr/bin/openssl", "ca", "-gencrl", "-out", "${General::swroot}/ovpn/crls/cacrl.pem", "-config", "${General::swroot}/ovpn/openssl/ovpn.cnf");
 
 ###
@@ -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) {


hooks/post-receive
--
IPFire 2.x development tree