From: Stefan Schantl <stefan.schantl@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH 3/3] vpnmain.cgi: Do not interpret $? as error code of move()
Date: Fri, 03 Sep 2021 18:27:58 +0200 [thread overview]
Message-ID: <4ca1577227d173e1c0652d0218928c30d5f12145.camel@ipfire.org> (raw)
In-Reply-To: <20210824155048.13859-3-michael.tremer@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 6153 bytes --]
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Tested-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> From: Stefan Schantl <stefan.schantl(a)ipfire.org>
>
> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> ---
> html/cgi-bin/vpnmain.cgi | 30 ++++++++++++++++++------------
> 1 file changed, 18 insertions(+), 12 deletions(-)
>
> diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
> index e9064e19c..7bb0d1b35 100644
> --- a/html/cgi-bin/vpnmain.cgi
> +++ b/html/cgi-bin/vpnmain.cgi
> @@ -675,8 +675,7 @@ END
> unlink ($filename);
> goto UPLOADCA_ERROR;
> } else {
> - move($filename,
> "${General::swroot}/ca/$cgiparams{'CA_NAME'}cert.pem");
> - if ($? ne 0) {
> + unless(move($filename,
> "${General::swroot}/ca/$cgiparams{'CA_NAME'}cert.pem")) {
> $errormessage = "$Lang::tr{'certificate file
> move failed'}: $!";
> unlink ($filename);
> goto UPLOADCA_ERROR;
> @@ -947,20 +946,23 @@ END
>
> if (!$errormessage) {
> &General::log("ipsec", "Moving cacert...");
> - move("/tmp/newcacert",
> "${General::swroot}/ca/cacert.pem");
> - $errormessage = "$Lang::tr{'certificate file
> move failed'}: $!" if ($? ne 0);
> + unless(move("/tmp/newcacert",
> "${General::swroot}/ca/cacert.pem")) {
> + $errormessage =
> "$Lang::tr{'certificate file move failed'}: $!";
> + }
> }
>
> if (!$errormessage) {
> &General::log("ipsec", "Moving host
> cert...");
> - move("/tmp/newhostcert",
> "${General::swroot}/certs/hostcert.pem");
> - $errormessage = "$Lang::tr{'certificate file
> move failed'}: $!" if ($? ne 0);
> + unless(move("/tmp/newhostcert",
> "${General::swroot}/certs/hostcert.pem")) {
> + $errormessage =
> "$Lang::tr{'certificate file move failed'}: $!";
> + }
> }
>
> if (!$errormessage) {
> &General::log("ipsec", "Moving private
> key...");
> - move("/tmp/newhostkey",
> "${General::swroot}/certs/hostkey.pem");
> - $errormessage = "$Lang::tr{'certificate file
> move failed'}: $!" if ($? ne 0);
> + unless(move("/tmp/newhostkey",
> "${General::swroot}/certs/hostkey.pem")) {
> + $errormessage =
> "$Lang::tr{'certificate file move failed'}: $!";
> + }
> }
>
> #cleanup temp files
> @@ -1979,8 +1981,11 @@ END
> while (grep(/Imported-$idx/,
> @names) ) {$idx++};
> $cgiparams{'CA_NAME'}="Import
> ed-$idx";
> $cgiparams{'CERT_NAME'}=&Head
> er::cleanhtml(getCNfromcert ('/tmp/newhostcert'));
> - move("/tmp/newcacert",
> "${General::swroot}/ca/$cgiparams{'CA_NAME'}cert.pem");
> - $errormessage =
> "$Lang::tr{'certificate file move failed'}: $!" if ($? ne 0);
> +
> + unless(move("/tmp/newcacert",
> "${General::swroot}/ca/$cgiparams{'CA_NAME'}cert.pem")) {
> + $errormessage =
> "$Lang::tr{'certificate file move failed'}: $!";
> + }
> +
> if (!$errormessage) {
> my $key =
> &General::findhasharraykey (\%cahash);
> $cahash{$key}[0] =
> $cgiparams{'CA_NAME'};
> @@ -1993,8 +1998,9 @@ END
> }
> if (!$errormessage) {
> &General::log("ipsec", "Moving host
> cert...");
> - move("/tmp/newhostcert",
> "${General::swroot}/certs/$cgiparams{'NAME'}cert.pem");
> - $errormessage = "$Lang::tr{'certificate file
> move failed'}: $!" if ($? ne 0);
> + unless(move("/tmp/newhostcert",
> "${General::swroot}/certs/$cgiparams{'NAME'}cert.pem")) {
> + $errormessage =
> "$Lang::tr{'certificate file move failed'}: $!";
> + }
> }
>
> #cleanup temp files
next prev parent reply other threads:[~2021-09-03 16:27 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 ` [PATCH 2/3] IPsec: Do not interpret $? as error code of move() Michael Tremer
2021-09-03 16:27 ` Stefan Schantl
2021-08-24 15:50 ` [PATCH 3/3] vpnmain.cgi: " Michael Tremer
2021-09-03 16:27 ` Stefan Schantl [this message]
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=4ca1577227d173e1c0652d0218928c30d5f12145.camel@ipfire.org \
--to=stefan.schantl@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