ovpnmain.cgi: Drop newcleanssldatabase()

I have no idea why this was added when there is a function that does the
same already. The remove function also had typos in the path which
probably resulted in it not working very well.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index e201a86c70805753fb54ae927c1ed768145a06a9..d486f9249da032c952917a0e3e8cbebf77397b38 100644 (file)
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -147,42 +147,26 @@ sub iscertlegacy
        return 0;
 }
 
-sub cleanssldatabase
-{
-    if (open(FILE, ">${General::swroot}/ovpn/certs/serial")) {
-       print FILE "01";
-       close FILE;
-    }
-    if (open(FILE, ">${General::swroot}/ovpn/certs/index.txt")) {
-       print FILE "";
-       close FILE;
-    }
-    if (open(FILE, ">${General::swroot}/ovpn/certs/index.txt.attr")) {
-      print FILE "";
-      close FILE;
-    }
-    unlink ("${General::swroot}/ovpn/certs/index.txt.old");
-    unlink ("${General::swroot}/ovpn/certs/index.txt.attr.old");
-    unlink ("${General::swroot}/ovpn/certs/serial.old");
-    unlink ("${General::swroot}/ovpn/certs/01.pem");
-}
+sub cleanssldatabase() {
+       if (open(FILE, ">${General::swroot}/ovpn/certs/serial")) {
+               print FILE "01";
+               close FILE;
+       }
 
-sub newcleanssldatabase
-{
-    if (! -s "${General::swroot}/ovpn/certs/serial" )  {
-        open(FILE, ">${General::swroot}(ovpn/certs/serial");
-       print FILE "01";
-       close FILE;
-    }
-    if (! -s ">${General::swroot}/ovpn/certs/index.txt") {
-       &General::system("touch", "${General::swroot}/ovpn/certs/index.txt");
-    }
-    if (! -s ">${General::swroot}/ovpn/certs/index.txt.attr") {
-       &General::system("touch", "${General::swroot}/ovpn/certs/index.txt.attr");
-    }
-    unlink ("${General::swroot}/ovpn/certs/index.txt.old");
-    unlink ("${General::swroot}/ovpn/certs/index.txt.attr.old");
-    unlink ("${General::swroot}/ovpn/certs/serial.old");
+       if (open(FILE, ">${General::swroot}/ovpn/certs/index.txt")) {
+               print FILE "";
+               close FILE;
+       }
+
+       if (open(FILE, ">${General::swroot}/ovpn/certs/index.txt.attr")) {
+               print FILE "";
+               close FILE;
+       }
+
+       unlink("${General::swroot}/ovpn/certs/index.txt.old");
+       unlink("${General::swroot}/ovpn/certs/index.txt.attr.old");
+       unlink("${General::swroot}/ovpn/certs/serial.old");
+       unlink("${General::swroot}/ovpn/certs/01.pem");
 }
 
 sub deletebackupcert
@@ -1801,7 +1785,7 @@ END
            unlink ("${General::swroot}/ovpn/serverkey.pem");
            unlink ("${General::swroot}/ovpn/certs/serverreq.pem");
            unlink ("${General::swroot}/ovpn/certs/servercert.pem");
-           &newcleanssldatabase();
+           &cleanssldatabase();
            goto ROOTCERT_ERROR;
        } else {
            unlink ("${General::swroot}/ovpn/certs/serverreq.pem");
@@ -3964,7 +3948,7 @@ if ($cgiparams{'TYPE'} eq 'net') {
                $errormessage = "$Lang::tr{'openssl produced an error'}: $?";
                unlink ($filename);
                unlink ("${General::swroot}/ovpn/certs/$cgiparams{'NAME'}cert.pem");
-               &newcleanssldatabase();
+               &cleanssldatabase();
                goto VPNCONF_ERROR;
            } else {
                unlink ($filename);
@@ -4192,7 +4176,7 @@ if ($cgiparams{'TYPE'} eq 'net') {
                unlink ("${General::swroot}/ovpn/certs/$cgiparams{'NAME'}key.pem");
                unlink ("${General::swroot}/ovpn/certs/$cgiparams{'NAME'}req.pem");
                unlink ("${General::swroot}/ovpn/certs/$cgiparams{'NAME'}cert.pem");
-               &newcleanssldatabase();
+               &cleanssldatabase();
                goto VPNCONF_ERROR;
            } else {
                unlink ("${General::swroot}/ovpn/certs/$cgiparams{'NAME'}req.pem");