Revert "IPsec: Try to restart always-on tunnels immediately"

[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 2a0351ea04c4f31f7b26d0d7ee3e40125f8a6f2b..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;
 }
 ###
@@ -436,12 +436,6 @@ sub writeipsecfiles {
                        if ($start_action eq 'route' && $inactivity_timeout > 0) {
                                print CONF "\tinactivity=$inactivity_timeout\n";
                        }
-
-                       # Restart the connection immediately when it has gone down
-                       # unexpectedly
-                       if ($start_action eq 'start') {
-                               print CONF "\tcloseaction=restart\n";
-                       }
                }
 
                # Fragmentation