From d05a89e352937d106501e8c6c4e5ad3766866334 Mon Sep 17 00:00:00 2001 From: Richard T Bonhomme Date: Wed, 30 Aug 2023 12:11:50 +0100 Subject: [PATCH] install_data_to_pki: Never create a pki/vars.example file Having a pki/vars.example file exist, leads to the incorrect conclusion that a pki/vars file is suitable. Therefore, never create an example file. Signed-off-by: Richard T Bonhomme --- easyrsa3/easyrsa | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa index e1c43cbea..f1564e924 100755 --- a/easyrsa3/easyrsa +++ b/easyrsa3/easyrsa @@ -1455,9 +1455,9 @@ install_data_to_pki() { EASYRSA_EXT_DIR "${area}/${x509_types_dir}" # Find other files - Omitting "$vars_file" + # shellcheck disable=SC2066 # loop will only run once for source in \ - "$vars_file_example" \ - "$ssl_cnf_file" \ + "$ssl_cnf_file" # EOL do # Find each item @@ -1481,16 +1481,6 @@ install_data_to_pki $context: $EASYRSA_EXT_DIR" return fi - # Always require a pki/vars.example file - if [ -e "$EASYRSA_PKI/vars.example" ];then - : # ok - else - create_vars_example > "$EASYRSA_PKI/vars.example" || \ - die "install_data_to_pki - create_vars_example FAILED" - verbose "\ -install_data_to_pki $context: create_vars_example OK" - fi - # Create PKI/vars from PKI/example unset -v new_vars_true if [ "$found_vars" = 1 ] || [ "$user_vars_true" ] || \