From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 2/3] IPsec: Do not interpret $? as error code of move()
Date: Tue, 24 Aug 2021 15:50:47 +0000 [thread overview]
Message-ID: <20210824155048.13859-2-michael.tremer@ipfire.org> (raw)
In-Reply-To: <20210824155048.13859-1-michael.tremer@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 822 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
html/cgi-bin/vpnmain.cgi | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index 980601ba0..e9064e19c 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;
}
--
2.20.1
next prev parent reply other threads:[~2021-08-24 15:50 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-24 15:50 [PATCH 1/3] IPsec: Fix extra whitespace in exported certificates Michael Tremer
2021-08-24 15:50 ` Michael Tremer [this message]
2021-09-03 16:27 ` [PATCH 2/3] IPsec: Do not interpret $? as error code of move() Stefan Schantl
2021-08-24 15:50 ` [PATCH 3/3] vpnmain.cgi: " Michael Tremer
2021-09-03 16:27 ` Stefan Schantl
2021-09-03 16:26 ` [PATCH 1/3] IPsec: Fix extra whitespace in exported certificates Stefan Schantl
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210824155048.13859-2-michael.tremer@ipfire.org \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox