verify_working_env(): Simple improvements, no functional changes

Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
This commit is contained in:
Richard T Bonhomme 2023-07-03 01:32:27 +01:00
parent 3db8c50782
commit 002c84fff1
No known key found for this signature in database
GPG Key ID: 2D767DB92FB6C246

View File

@ -5708,16 +5708,14 @@ verify_working_env() {
if [ -d "$EASYRSA_TEMP_DIR" ]; then
# Temp dir session
secure_session || \
die "\
secure_session || die "\
verify_working_env - secure-session failed"
# Install data-files into ALL PKIs
# This will find x509-types
# and export EASYRSA_EXT_DIR or die.
# Other errors only require warning.
install_data_to_pki vars-setup || \
warn "\
install_data_to_pki vars-setup || warn "\
verify_working_env - install_data_to_pki vars-setup failed"
# if the vars file in use is not in the PKI
@ -5737,9 +5735,9 @@ verify_working_env - install_data_to_pki vars-setup failed"
# Check $working_safe_ssl_conf, to build
# a fully configured safe ssl conf, on the
# next invocation of easyrsa_openssl()
[ -z "$working_safe_ssl_conf" ] || {
if [ "$working_safe_ssl_conf" ]; then
die "working_safe_ssl_conf must not be set!"
}
fi
# Verify CA is initialised
if [ "$require_ca" ]; then