Merge branch 'gen_crl-preserve-permissions' of ssh://github.com/Tabiskabis/easy-rsa into Tabiskabis-gen_crl-preserve-permissions
Amendments: * Remove trailing space. * Catch error on update. Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
This commit is contained in:
commit
057fba01e8
@ -3734,12 +3734,18 @@ gen_crl() {
|
|||||||
easyrsa_mktemp out_file_tmp || \
|
easyrsa_mktemp out_file_tmp || \
|
||||||
die "gen_crl - easyrsa_mktemp out_file_tmp"
|
die "gen_crl - easyrsa_mktemp out_file_tmp"
|
||||||
|
|
||||||
|
if [ -r "$out_file" ]; then
|
||||||
|
cp -p "$out_file" "$out_file_tmp" || \
|
||||||
|
warn "Failed to preserve CRL file permissions."
|
||||||
|
fi
|
||||||
|
|
||||||
easyrsa_openssl ca -utf8 -gencrl -out "$out_file_tmp" \
|
easyrsa_openssl ca -utf8 -gencrl -out "$out_file_tmp" \
|
||||||
${EASYRSA_CRL_DAYS:+ -days "$EASYRSA_CRL_DAYS"} \
|
${EASYRSA_CRL_DAYS:+ -days "$EASYRSA_CRL_DAYS"} \
|
||||||
${EASYRSA_PASSIN:+ -passin "$EASYRSA_PASSIN"} || \
|
${EASYRSA_PASSIN:+ -passin "$EASYRSA_PASSIN"} || \
|
||||||
die "CRL Generation failed."
|
die "CRL Generation failed."
|
||||||
|
|
||||||
mv ${EASYRSA_BATCH:+ -f} "$out_file_tmp" "$out_file"
|
mv ${EASYRSA_BATCH:+ -f} "$out_file_tmp" "$out_file" || \
|
||||||
|
die "Failed to update CRL file."
|
||||||
|
|
||||||
notice "\
|
notice "\
|
||||||
An updated CRL has been created:
|
An updated CRL has been created:
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user