Merge branch 'kernel-4.14' into next

[people/pmueller/ipfire-2.x.git] / html / cgi-bin / vpnmain.cgi

diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index 17873d62bea2933affb1d6fa662e66eb63f3eb3d..378acb3268e0f29c7fa27c53461d98f524067dc9 100644 (file)
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -199,10 +199,10 @@ sub callssl ($) {
 sub getCNfromcert ($) {
        #&General::log("ipsec", "Extracting name from $_[0]...");
        my $temp = `/usr/bin/openssl x509 -text -in $_[0]`;
-       $temp =~ /Subject:.*CN=(.*)[\n]/;
+       $temp =~ /Subject:.*CN = (.*)[\n]/;
        $temp = $1;
        $temp =~ s+/Email+, E+;
-       $temp =~ s/ ST=/ S=/;
+       $temp =~ s/ ST = / S = /;
        $temp =~ s/,//g;
        $temp =~ s/\'//g;
        return $temp;
@@ -216,7 +216,7 @@ sub getsubjectfromcert ($) {
        $temp =~ /Subject: (.*)[\n]/;
        $temp = $1;
        $temp =~ s+/Email+, E+;
-       $temp =~ s/ ST=/ S=/;
+       $temp =~ s/ ST = / S = /;
        return $temp;
 }
 ###