openvpn: Deleted double entries for TLSAUTH and DAUTH.
authorErik Kapfer <erik.kapfer@ipfire.org>
Sat, 17 May 2014 19:32:55 +0000 (21:32 +0200)
committerErik Kapfer <erik.kapfer@ipfire.org>
Sat, 17 May 2014 19:32:55 +0000 (21:32 +0200)
Also drop remaining if clauses for Engines.

html/cgi-bin/ovpnmain.cgi

index 907e8c0..4d55d01 100644 (file)
@@ -2511,20 +2511,8 @@ ADV_ERROR:
     if ($cgiparams{'DAUTH'} eq '') {
                $cgiparams{'DAUTH'} = 'SHA1';
     }
-    if ($cgiparams{'DAUTH'} eq '') {
-       $cgiparams{'DAUTH'} = 'SHA1';
-    }
-    if ($cgiparams{'ENGINES'} eq '') {
-       $cgiparams{'ENGINES'} = 'disabled';
-    }
-    if ($cgiparams{'TLSAUTH'} eq '') {
-       $cgiparams{'TLSAUTH'} = 'off';
-    }
-    if ($cgiparams{'DAUTH'} eq '') {
-       $cgiparams{'DAUTH'} = 'SHA1';
-    }
     if ($cgiparams{'TLSAUTH'} eq '') {
-       $cgiparams{'TLSAUTH'} = 'off';
+               $cgiparams{'TLSAUTH'} = 'off';
     }
     $checked{'CLIENT2CLIENT'}{'off'} = '';
     $checked{'CLIENT2CLIENT'}{'on'} = '';
@@ -4927,9 +4915,6 @@ END
        if ($cgiparams{'DAUTH'} eq '') {
                $cgiparams{'DAUTH'} = 'SHA1';
     }
-    if ($cgiparams{'ENGINES'} eq '') {
-       $cgiparams{'ENGINES'} = 'disabled';
-    }
     if ($cgiparams{'DOVPN_SUBNET'} eq '') {
                $cgiparams{'DOVPN_SUBNET'} = '10.' . int(rand(256)) . '.' . int(rand(256)) . '.0/255.255.255.0';
     }