Merge branch 'gen_crl-preserve-permissions' of ssh://github.com/Tabis…

…kabis/easy-rsa into Tabiskabis-gen_crl-preserve-permissions Amendments: * Remove trailing space. * Catch error on update. Signed-off-by: Richard T Bonhomme <[email protected]>
OpenVPN · Sep 20, 2023 · 057fba0 · 057fba0
2 parents e6b8e62 + 342b588
commit 057fba0
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa
@@ -3734,12 +3734,18 @@ 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_CRL_DAYS:+ -days "$EASYRSA_CRL_DAYS"} \
 		${EASYRSA_PASSIN:+ -passin "$EASYRSA_PASSIN"} || \
 			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 "\
 An updated CRL has been created: