From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 19 Aug 2021 13:04:01 +0000 (+0000)
Subject: IPsec: Do not interpret $? as error code of move()
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b845e9a61152e898b83879771030effaf1c5d5cd;p=people%2Fms%2Fipfire-2.x.git

IPsec: Do not interpret $? as error code of move()

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

diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index 980601ba0a..e9064e19c3 100644
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -2042,9 +2042,8 @@ END
 			unlink ($filename);
 			goto VPNCONF_ERROR;
 		} else {
-			move($filename, "${General::swroot}/certs/$cgiparams{'NAME'}cert.pem");
-			if ($? ne 0) {
-				$errormessage = "$Lang::tr{'certificate file move failed'}: $!";
+			unless (move($filename, "${General::swroot}/certs/$cgiparams{'NAME'}cert.pem")) {
+				$errormessage = "$Lang::tr{'certificate file move failed'} ($filename): $!";
 				unlink ($filename);
 				goto VPNCONF_ERROR;
 			}