Revert "vpnmain.cgi: Fix for 2nd part of bug10595"

This reverts commit 7b29acfbb597b89837dcbe1b91ef6ef4352f28a6.

diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
old mode 100644 (file)
new mode 100755 (executable)
index 694eeed..3541aaa
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -245,7 +245,7 @@ sub callssl ($) {
 ###
 sub getCNfromcert ($) {
        #&General::log("ipsec", "Extracting name from $_[0]...");
-       my $temp = `/usr/bin/openssl x509 -text -in '$_[0]'`;
+       my $temp = `/usr/bin/openssl x509 -text -in $_[0]`;
        $temp =~ /Subject:.*CN\s*=\s*(.*)[\n]/;
        $temp = $1;
        $temp =~ s+/Email+, E+;
@@ -259,7 +259,7 @@ sub getCNfromcert ($) {
 ###
 sub getsubjectfromcert ($) {
        #&General::log("ipsec", "Extracting subject from $_[0]...");
-       my $temp = `/usr/bin/openssl x509 -text -in '$_[0]'`;
+       my $temp = `/usr/bin/openssl x509 -text -in $_[0]`;
        $temp =~ /Subject: (.*)[\n]/;
        $temp = $1;
        $temp =~ s+/Email+, E+;
@@ -644,8 +644,8 @@ END
 } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'upload ca certificate'}) {
        &General::readhasharray("${General::swroot}/vpn/caconfig", \%cahash);
 
-       if ($cgiparams{'CA_NAME'} !~ /^[a-zA-Z0-9 ]*$/) {
-               $errormessage = $Lang::tr{'ca name must only contain characters or spaces'};
+       if ($cgiparams{'CA_NAME'} !~ /^[a-zA-Z0-9]+$/) {
+               $errormessage = $Lang::tr{'name must only contain characters'};
                goto UPLOADCA_ERROR;
        }